[PATCH 00/14] staging: vt6655: Tidy up s_uGetDataDuration function

[PATCH 00/14] staging: vt6655: Tidy up s_uGetDataDuration function

[Dominik Karol Piątkowski]

This series tidies up s_uGetDataDuration function by renaming its parameters and
variables from camel case (including Hungarian notation) to snake case, and
fixing its declaration formatting.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>

Dominik Karol Piątkowski (14):
  staging: vt6655: s_uGetDataDuration: Rename pDevice parameter
  staging: vt6655: s_uGetDataDuration: Rename byDurType parameter
  staging: vt6655: s_uGetDataDuration: Rename cbFrameLength parameter
  staging: vt6655: s_uGetDataDuration: Rename byPktType parameter
  staging: vt6655: s_uGetDataDuration: Rename wRate parameter
  staging: vt6655: s_uGetDataDuration: Rename bNeedAck parameter
  staging: vt6655: s_uGetDataDuration: Rename uFragIdx parameter
  staging: vt6655: s_uGetDataDuration: Rename cbLastFragmentSize
    parameter
  staging: vt6655: s_uGetDataDuration: Rename uMACfragNum parameter
  staging: vt6655: s_uGetDataDuration: Rename byFBOption parameter
  staging: vt6655: s_uGetDataDuration: Rename bLastFrag variable
  staging: vt6655: s_uGetDataDuration: Rename uAckTime variable
  staging: vt6655: s_uGetDataDuration: Rename uNextPktTime variable
  staging: vt6655: s_uGetDataDuration: Fix declaration formatting

 drivers/staging/vt6655/rxtx.c | 110 ++++++++++++++++------------------
 1 file changed, 53 insertions(+), 57 deletions(-)

-- 
2.34.1

[PATCH 01/14] staging: vt6655: s_uGetDataDuration: Rename pDevice parameter

[Dominik Karol Piątkowski]

This patch renames pDevice to priv in s_uGetDataDuration function in
order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 3705cb1e87b6..a1dadc3e8cb5 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -229,7 +229,7 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
 static
 unsigned int
 s_uGetDataDuration(
-	struct vnt_private *pDevice,
+	struct vnt_private *priv,
 	unsigned char byDurType,
 	unsigned int cbFrameLength,
 	unsigned char byPktType,
@@ -255,9 +255,9 @@ s_uGetDataDuration(
 	switch (byDurType) {
 	case DATADUR_B:    /* DATADUR_B */
 		if (bNeedAck) {
-			uAckTime = bb_get_frame_time(pDevice->preamble_type,
+			uAckTime = bb_get_frame_time(priv->preamble_type,
 						     byPktType, 14,
-						     pDevice->byTopCCKBasicRate);
+						     priv->byTopCCKBasicRate);
 		}
 		/* Non Frag or Last Frag */
 		if ((uMACfragNum == 1) || bLastFrag) {
@@ -265,17 +265,17 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType,
+			uNextPktTime = s_uGetTxRsvTime(priv, byPktType,
 						       len, wRate, bNeedAck);
 		}
 
-		return pDevice->uSIFS + uAckTime + uNextPktTime;
+		return priv->uSIFS + uAckTime + uNextPktTime;
 
 	case DATADUR_A:    /* DATADUR_A */
 		if (bNeedAck) {
-			uAckTime = bb_get_frame_time(pDevice->preamble_type,
+			uAckTime = bb_get_frame_time(priv->preamble_type,
 						     byPktType, 14,
-						     pDevice->byTopOFDMBasicRate);
+						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
 		if ((uMACfragNum == 1) || bLastFrag) {
@@ -283,18 +283,18 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType,
+			uNextPktTime = s_uGetTxRsvTime(priv, byPktType,
 						       len, wRate, bNeedAck);
 		}
 
-		return pDevice->uSIFS + uAckTime + uNextPktTime;
+		return priv->uSIFS + uAckTime + uNextPktTime;
 
 	case DATADUR_A_F0:    /* DATADUR_A_F0 */
 	case DATADUR_A_F1:    /* DATADUR_A_F1 */
 		if (bNeedAck) {
-			uAckTime = bb_get_frame_time(pDevice->preamble_type,
+			uAckTime = bb_get_frame_time(priv->preamble_type,
 						     byPktType, 14,
-						     pDevice->byTopOFDMBasicRate);
+						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
 		if ((uMACfragNum == 1) || bLastFrag) {
@@ -314,11 +314,11 @@ s_uGetDataDuration(
 			else
 				wRate = fb_opt1[FB_RATE0][wRate];
 
-			uNextPktTime = s_uGetTxRsvTime(pDevice, byPktType,
+			uNextPktTime = s_uGetTxRsvTime(priv, byPktType,
 						       len, wRate, bNeedAck);
 		}
 
-		return pDevice->uSIFS + uAckTime + uNextPktTime;
+		return priv->uSIFS + uAckTime + uNextPktTime;
 
 	default:
 		break;
-- 
2.34.1

[PATCH 02/14] staging: vt6655: s_uGetDataDuration: Rename byDurType parameter

[Dominik Karol Piątkowski]

This patch renames byDurType to dur_type in s_uGetDataDuration function
in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index a1dadc3e8cb5..239fa4a1af66 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -230,7 +230,7 @@ static
 unsigned int
 s_uGetDataDuration(
 	struct vnt_private *priv,
-	unsigned char byDurType,
+	unsigned char dur_type,
 	unsigned int cbFrameLength,
 	unsigned char byPktType,
 	unsigned short wRate,
@@ -252,7 +252,7 @@ s_uGetDataDuration(
 	else
 		len = cbFrameLength;
 
-	switch (byDurType) {
+	switch (dur_type) {
 	case DATADUR_B:    /* DATADUR_B */
 		if (bNeedAck) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
-- 
2.34.1

[PATCH 03/14] staging: vt6655: s_uGetDataDuration: Rename cbFrameLength parameter

[Dominik Karol Piątkowski]

This patch renames cbFrameLength to frame_length in s_uGetDataDuration
function in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 239fa4a1af66..1747018e747a 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -231,7 +231,7 @@ unsigned int
 s_uGetDataDuration(
 	struct vnt_private *priv,
 	unsigned char dur_type,
-	unsigned int cbFrameLength,
+	unsigned int frame_length,
 	unsigned char byPktType,
 	unsigned short wRate,
 	bool bNeedAck,
@@ -250,7 +250,7 @@ s_uGetDataDuration(
 	if (uFragIdx == (uMACfragNum - 2))
 		len = cbLastFragmentSize;
 	else
-		len = cbFrameLength;
+		len = frame_length;
 
 	switch (dur_type) {
 	case DATADUR_B:    /* DATADUR_B */
-- 
2.34.1

[PATCH 04/14] staging: vt6655: s_uGetDataDuration: Rename byPktType parameter

[Dominik Karol Piątkowski]

This patch renames byPktType to pkt_type in s_uGetDataDuration function
in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 1747018e747a..dd228962dd77 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -232,7 +232,7 @@ s_uGetDataDuration(
 	struct vnt_private *priv,
 	unsigned char dur_type,
 	unsigned int frame_length,
-	unsigned char byPktType,
+	unsigned char pkt_type,
 	unsigned short wRate,
 	bool bNeedAck,
 	unsigned int uFragIdx,
@@ -256,7 +256,7 @@ s_uGetDataDuration(
 	case DATADUR_B:    /* DATADUR_B */
 		if (bNeedAck) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
-						     byPktType, 14,
+						     pkt_type, 14,
 						     priv->byTopCCKBasicRate);
 		}
 		/* Non Frag or Last Frag */
@@ -265,7 +265,7 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			uNextPktTime = s_uGetTxRsvTime(priv, byPktType,
+			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
 						       len, wRate, bNeedAck);
 		}
 
@@ -274,7 +274,7 @@ s_uGetDataDuration(
 	case DATADUR_A:    /* DATADUR_A */
 		if (bNeedAck) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
-						     byPktType, 14,
+						     pkt_type, 14,
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
@@ -283,7 +283,7 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			uNextPktTime = s_uGetTxRsvTime(priv, byPktType,
+			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
 						       len, wRate, bNeedAck);
 		}
 
@@ -293,7 +293,7 @@ s_uGetDataDuration(
 	case DATADUR_A_F1:    /* DATADUR_A_F1 */
 		if (bNeedAck) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
-						     byPktType, 14,
+						     pkt_type, 14,
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
@@ -314,7 +314,7 @@ s_uGetDataDuration(
 			else
 				wRate = fb_opt1[FB_RATE0][wRate];
 
-			uNextPktTime = s_uGetTxRsvTime(priv, byPktType,
+			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
 						       len, wRate, bNeedAck);
 		}
 
-- 
2.34.1

[PATCH 05/14] staging: vt6655: s_uGetDataDuration: Rename wRate parameter

[Dominik Karol Piątkowski]

This patch renames wRate to rate in s_uGetDataDuration function in order
to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index dd228962dd77..7dd57d2e2831 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -233,7 +233,7 @@ s_uGetDataDuration(
 	unsigned char dur_type,
 	unsigned int frame_length,
 	unsigned char pkt_type,
-	unsigned short wRate,
+	unsigned short rate,
 	bool bNeedAck,
 	unsigned int uFragIdx,
 	unsigned int cbLastFragmentSize,
@@ -266,7 +266,7 @@ s_uGetDataDuration(
 		} else {
 			/* First Frag or Mid Frag */
 			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, wRate, bNeedAck);
+						       len, rate, bNeedAck);
 		}
 
 		return priv->uSIFS + uAckTime + uNextPktTime;
@@ -284,7 +284,7 @@ s_uGetDataDuration(
 		} else {
 			/* First Frag or Mid Frag */
 			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, wRate, bNeedAck);
+						       len, rate, bNeedAck);
 		}
 
 		return priv->uSIFS + uAckTime + uNextPktTime;
@@ -302,20 +302,20 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			if (wRate < RATE_18M)
-				wRate = RATE_18M;
-			else if (wRate > RATE_54M)
-				wRate = RATE_54M;
+			if (rate < RATE_18M)
+				rate = RATE_18M;
+			else if (rate > RATE_54M)
+				rate = RATE_54M;
 
-			wRate -= RATE_18M;
+			rate -= RATE_18M;
 
 			if (byFBOption == AUTO_FB_0)
-				wRate = fb_opt0[FB_RATE0][wRate];
+				rate = fb_opt0[FB_RATE0][rate];
 			else
-				wRate = fb_opt1[FB_RATE0][wRate];
+				rate = fb_opt1[FB_RATE0][rate];
 
 			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, wRate, bNeedAck);
+						       len, rate, bNeedAck);
 		}
 
 		return priv->uSIFS + uAckTime + uNextPktTime;
-- 
2.34.1

[PATCH 06/14] staging: vt6655: s_uGetDataDuration: Rename bNeedAck parameter

[Dominik Karol Piątkowski]

This patch renames bNeedAck to need_ack in s_uGetDataDuration function
in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 7dd57d2e2831..72837898ea29 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -234,7 +234,7 @@ s_uGetDataDuration(
 	unsigned int frame_length,
 	unsigned char pkt_type,
 	unsigned short rate,
-	bool bNeedAck,
+	bool need_ack,
 	unsigned int uFragIdx,
 	unsigned int cbLastFragmentSize,
 	unsigned int uMACfragNum,
@@ -254,51 +254,51 @@ s_uGetDataDuration(
 
 	switch (dur_type) {
 	case DATADUR_B:    /* DATADUR_B */
-		if (bNeedAck) {
+		if (need_ack) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
 						     pkt_type, 14,
 						     priv->byTopCCKBasicRate);
 		}
 		/* Non Frag or Last Frag */
 		if ((uMACfragNum == 1) || bLastFrag) {
-			if (!bNeedAck)
+			if (!need_ack)
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
 			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, rate, bNeedAck);
+						       len, rate, need_ack);
 		}
 
 		return priv->uSIFS + uAckTime + uNextPktTime;
 
 	case DATADUR_A:    /* DATADUR_A */
-		if (bNeedAck) {
+		if (need_ack) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
 						     pkt_type, 14,
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
 		if ((uMACfragNum == 1) || bLastFrag) {
-			if (!bNeedAck)
+			if (!need_ack)
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
 			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, rate, bNeedAck);
+						       len, rate, need_ack);
 		}
 
 		return priv->uSIFS + uAckTime + uNextPktTime;
 
 	case DATADUR_A_F0:    /* DATADUR_A_F0 */
 	case DATADUR_A_F1:    /* DATADUR_A_F1 */
-		if (bNeedAck) {
+		if (need_ack) {
 			uAckTime = bb_get_frame_time(priv->preamble_type,
 						     pkt_type, 14,
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
 		if ((uMACfragNum == 1) || bLastFrag) {
-			if (!bNeedAck)
+			if (!need_ack)
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
@@ -315,7 +315,7 @@ s_uGetDataDuration(
 				rate = fb_opt1[FB_RATE0][rate];
 
 			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, rate, bNeedAck);
+						       len, rate, need_ack);
 		}
 
 		return priv->uSIFS + uAckTime + uNextPktTime;
-- 
2.34.1

[PATCH 07/14] staging: vt6655: s_uGetDataDuration: Rename uFragIdx parameter

[Dominik Karol Piątkowski]

This patch renames uFragIdx to frag_idx in s_uGetDataDuration function in
order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 72837898ea29..3d7bdcba83a9 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -235,7 +235,7 @@ s_uGetDataDuration(
 	unsigned char pkt_type,
 	unsigned short rate,
 	bool need_ack,
-	unsigned int uFragIdx,
+	unsigned int frag_idx,
 	unsigned int cbLastFragmentSize,
 	unsigned int uMACfragNum,
 	unsigned char byFBOption
@@ -244,10 +244,10 @@ s_uGetDataDuration(
 	bool bLastFrag = false;
 	unsigned int uAckTime = 0, uNextPktTime = 0, len;
 
-	if (uFragIdx == (uMACfragNum - 1))
+	if (frag_idx == (uMACfragNum - 1))
 		bLastFrag = true;
 
-	if (uFragIdx == (uMACfragNum - 2))
+	if (frag_idx == (uMACfragNum - 2))
 		len = cbLastFragmentSize;
 	else
 		len = frame_length;
-- 
2.34.1

[PATCH 08/14] staging: vt6655: s_uGetDataDuration: Rename cbLastFragmentSize parameter

[Dominik Karol Piątkowski]

This patch renames cbLastFragmentSize to last_fragment_size in
s_uGetDataDuration function in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 3d7bdcba83a9..1d0b5b8f09c2 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -236,7 +236,7 @@ s_uGetDataDuration(
 	unsigned short rate,
 	bool need_ack,
 	unsigned int frag_idx,
-	unsigned int cbLastFragmentSize,
+	unsigned int last_fragment_size,
 	unsigned int uMACfragNum,
 	unsigned char byFBOption
 )
@@ -248,7 +248,7 @@ s_uGetDataDuration(
 		bLastFrag = true;
 
 	if (frag_idx == (uMACfragNum - 2))
-		len = cbLastFragmentSize;
+		len = last_fragment_size;
 	else
 		len = frame_length;
 
-- 
2.34.1

[PATCH 09/14] staging: vt6655: s_uGetDataDuration: Rename uMACfragNum parameter

[Dominik Karol Piątkowski]

This patch renames uMACfragNum to mac_frag_num in s_uGetDataDuration
function in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 1d0b5b8f09c2..ca92dd72cb72 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -237,17 +237,17 @@ s_uGetDataDuration(
 	bool need_ack,
 	unsigned int frag_idx,
 	unsigned int last_fragment_size,
-	unsigned int uMACfragNum,
+	unsigned int mac_frag_num,
 	unsigned char byFBOption
 )
 {
 	bool bLastFrag = false;
 	unsigned int uAckTime = 0, uNextPktTime = 0, len;
 
-	if (frag_idx == (uMACfragNum - 1))
+	if (frag_idx == (mac_frag_num - 1))
 		bLastFrag = true;
 
-	if (frag_idx == (uMACfragNum - 2))
+	if (frag_idx == (mac_frag_num - 2))
 		len = last_fragment_size;
 	else
 		len = frame_length;
@@ -260,7 +260,7 @@ s_uGetDataDuration(
 						     priv->byTopCCKBasicRate);
 		}
 		/* Non Frag or Last Frag */
-		if ((uMACfragNum == 1) || bLastFrag) {
+		if ((mac_frag_num == 1) || bLastFrag) {
 			if (!need_ack)
 				return 0;
 		} else {
@@ -278,7 +278,7 @@ s_uGetDataDuration(
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
-		if ((uMACfragNum == 1) || bLastFrag) {
+		if ((mac_frag_num == 1) || bLastFrag) {
 			if (!need_ack)
 				return 0;
 		} else {
@@ -297,7 +297,7 @@ s_uGetDataDuration(
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
-		if ((uMACfragNum == 1) || bLastFrag) {
+		if ((mac_frag_num == 1) || bLastFrag) {
 			if (!need_ack)
 				return 0;
 		} else {
-- 
2.34.1

[PATCH 10/14] staging: vt6655: s_uGetDataDuration: Rename byFBOption parameter

[Dominik Karol Piątkowski]

This patch renames byFBOption to fb_option in s_uGetDataDuration
function in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index ca92dd72cb72..58446eba82cc 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -238,7 +238,7 @@ s_uGetDataDuration(
 	unsigned int frag_idx,
 	unsigned int last_fragment_size,
 	unsigned int mac_frag_num,
-	unsigned char byFBOption
+	unsigned char fb_option
 )
 {
 	bool bLastFrag = false;
@@ -309,7 +309,7 @@ s_uGetDataDuration(
 
 			rate -= RATE_18M;
 
-			if (byFBOption == AUTO_FB_0)
+			if (fb_option == AUTO_FB_0)
 				rate = fb_opt0[FB_RATE0][rate];
 			else
 				rate = fb_opt1[FB_RATE0][rate];
-- 
2.34.1

[PATCH 11/14] staging: vt6655: s_uGetDataDuration: Rename bLastFrag variable

[Dominik Karol Piątkowski]

This patch renames bLastFrag to last_frag in s_uGetDataDuration function
in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 58446eba82cc..4b0a768cf77b 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -241,11 +241,11 @@ s_uGetDataDuration(
 	unsigned char fb_option
 )
 {
-	bool bLastFrag = false;
+	bool last_frag = false;
 	unsigned int uAckTime = 0, uNextPktTime = 0, len;
 
 	if (frag_idx == (mac_frag_num - 1))
-		bLastFrag = true;
+		last_frag = true;
 
 	if (frag_idx == (mac_frag_num - 2))
 		len = last_fragment_size;
@@ -260,7 +260,7 @@ s_uGetDataDuration(
 						     priv->byTopCCKBasicRate);
 		}
 		/* Non Frag or Last Frag */
-		if ((mac_frag_num == 1) || bLastFrag) {
+		if ((mac_frag_num == 1) || last_frag) {
 			if (!need_ack)
 				return 0;
 		} else {
@@ -278,7 +278,7 @@ s_uGetDataDuration(
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
-		if ((mac_frag_num == 1) || bLastFrag) {
+		if ((mac_frag_num == 1) || last_frag) {
 			if (!need_ack)
 				return 0;
 		} else {
@@ -297,7 +297,7 @@ s_uGetDataDuration(
 						     priv->byTopOFDMBasicRate);
 		}
 		/* Non Frag or Last Frag */
-		if ((mac_frag_num == 1) || bLastFrag) {
+		if ((mac_frag_num == 1) || last_frag) {
 			if (!need_ack)
 				return 0;
 		} else {
-- 
2.34.1

[PATCH 12/14] staging: vt6655: s_uGetDataDuration: Rename uAckTime variable

[Dominik Karol Piątkowski]

This patch renames uAckTime to ack_time in s_uGetDataDuration function
in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 4b0a768cf77b..8f28fd1465d4 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -242,7 +242,7 @@ s_uGetDataDuration(
 )
 {
 	bool last_frag = false;
-	unsigned int uAckTime = 0, uNextPktTime = 0, len;
+	unsigned int ack_time = 0, uNextPktTime = 0, len;
 
 	if (frag_idx == (mac_frag_num - 1))
 		last_frag = true;
@@ -255,7 +255,7 @@ s_uGetDataDuration(
 	switch (dur_type) {
 	case DATADUR_B:    /* DATADUR_B */
 		if (need_ack) {
-			uAckTime = bb_get_frame_time(priv->preamble_type,
+			ack_time = bb_get_frame_time(priv->preamble_type,
 						     pkt_type, 14,
 						     priv->byTopCCKBasicRate);
 		}
@@ -269,11 +269,11 @@ s_uGetDataDuration(
 						       len, rate, need_ack);
 		}
 
-		return priv->uSIFS + uAckTime + uNextPktTime;
+		return priv->uSIFS + ack_time + uNextPktTime;
 
 	case DATADUR_A:    /* DATADUR_A */
 		if (need_ack) {
-			uAckTime = bb_get_frame_time(priv->preamble_type,
+			ack_time = bb_get_frame_time(priv->preamble_type,
 						     pkt_type, 14,
 						     priv->byTopOFDMBasicRate);
 		}
@@ -287,12 +287,12 @@ s_uGetDataDuration(
 						       len, rate, need_ack);
 		}
 
-		return priv->uSIFS + uAckTime + uNextPktTime;
+		return priv->uSIFS + ack_time + uNextPktTime;
 
 	case DATADUR_A_F0:    /* DATADUR_A_F0 */
 	case DATADUR_A_F1:    /* DATADUR_A_F1 */
 		if (need_ack) {
-			uAckTime = bb_get_frame_time(priv->preamble_type,
+			ack_time = bb_get_frame_time(priv->preamble_type,
 						     pkt_type, 14,
 						     priv->byTopOFDMBasicRate);
 		}
@@ -318,7 +318,7 @@ s_uGetDataDuration(
 						       len, rate, need_ack);
 		}
 
-		return priv->uSIFS + uAckTime + uNextPktTime;
+		return priv->uSIFS + ack_time + uNextPktTime;
 
 	default:
 		break;
-- 
2.34.1

[PATCH 13/14] staging: vt6655: s_uGetDataDuration: Rename uNextPktTime variable

[Dominik Karol Piątkowski]

This patch renames uNextPktTime to next_pkt_time in s_uGetDataDuration
function in order to avoid using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 8f28fd1465d4..5e93ca38008e 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -242,7 +242,7 @@ s_uGetDataDuration(
 )
 {
 	bool last_frag = false;
-	unsigned int ack_time = 0, uNextPktTime = 0, len;
+	unsigned int ack_time = 0, next_pkt_time = 0, len;
 
 	if (frag_idx == (mac_frag_num - 1))
 		last_frag = true;
@@ -265,11 +265,11 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, rate, need_ack);
+			next_pkt_time = s_uGetTxRsvTime(priv, pkt_type,
+							len, rate, need_ack);
 		}
 
-		return priv->uSIFS + ack_time + uNextPktTime;
+		return priv->uSIFS + ack_time + next_pkt_time;
 
 	case DATADUR_A:    /* DATADUR_A */
 		if (need_ack) {
@@ -283,11 +283,11 @@ s_uGetDataDuration(
 				return 0;
 		} else {
 			/* First Frag or Mid Frag */
-			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, rate, need_ack);
+			next_pkt_time = s_uGetTxRsvTime(priv, pkt_type,
+							len, rate, need_ack);
 		}
 
-		return priv->uSIFS + ack_time + uNextPktTime;
+		return priv->uSIFS + ack_time + next_pkt_time;
 
 	case DATADUR_A_F0:    /* DATADUR_A_F0 */
 	case DATADUR_A_F1:    /* DATADUR_A_F1 */
@@ -314,11 +314,11 @@ s_uGetDataDuration(
 			else
 				rate = fb_opt1[FB_RATE0][rate];
 
-			uNextPktTime = s_uGetTxRsvTime(priv, pkt_type,
-						       len, rate, need_ack);
+			next_pkt_time = s_uGetTxRsvTime(priv, pkt_type,
+							len, rate, need_ack);
 		}
 
-		return priv->uSIFS + ack_time + uNextPktTime;
+		return priv->uSIFS + ack_time + next_pkt_time;
 
 	default:
 		break;
-- 
2.34.1

[PATCH 14/14] staging: vt6655: s_uGetDataDuration: Fix declaration formatting

[Dominik Karol Piątkowski]

This patch fixes formatting of s_uGetDataDuration function declaration.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/vt6655/rxtx.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 5e93ca38008e..4bcc75348284 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -226,20 +226,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
 }
 
 /* byFreqType 0: 5GHz, 1:2.4Ghz */
-static
-unsigned int
-s_uGetDataDuration(
-	struct vnt_private *priv,
-	unsigned char dur_type,
-	unsigned int frame_length,
-	unsigned char pkt_type,
-	unsigned short rate,
-	bool need_ack,
-	unsigned int frag_idx,
-	unsigned int last_fragment_size,
-	unsigned int mac_frag_num,
-	unsigned char fb_option
-)
+static unsigned int s_uGetDataDuration(struct vnt_private *priv,
+				       unsigned char dur_type,
+				       unsigned int frame_length,
+				       unsigned char pkt_type,
+				       unsigned short rate,
+				       bool need_ack,
+				       unsigned int frag_idx,
+				       unsigned int last_fragment_size,
+				       unsigned int mac_frag_num,
+				       unsigned char fb_option)
 {
 	bool last_frag = false;
 	unsigned int ack_time = 0, next_pkt_time = 0, len;
-- 
2.34.1

Re: [PATCH 00/14] staging: vt6655: Tidy up s_uGetDataDuration function

[Philipp Hortmann]

On 9/18/24 21:20, Dominik Karol Piątkowski wrote:
> This series tidies up s_uGetDataDuration function by renaming its parameters and
> variables from camel case (including Hungarian notation) to snake case, and
> fixing its declaration formatting.
> 
> Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
> 
> Dominik Karol Piątkowski (14):
>    staging: vt6655: s_uGetDataDuration: Rename pDevice parameter
>    staging: vt6655: s_uGetDataDuration: Rename byDurType parameter
>    staging: vt6655: s_uGetDataDuration: Rename cbFrameLength parameter
>    staging: vt6655: s_uGetDataDuration: Rename byPktType parameter
>    staging: vt6655: s_uGetDataDuration: Rename wRate parameter
>    staging: vt6655: s_uGetDataDuration: Rename bNeedAck parameter
>    staging: vt6655: s_uGetDataDuration: Rename uFragIdx parameter
>    staging: vt6655: s_uGetDataDuration: Rename cbLastFragmentSize
>      parameter
>    staging: vt6655: s_uGetDataDuration: Rename uMACfragNum parameter
>    staging: vt6655: s_uGetDataDuration: Rename byFBOption parameter
>    staging: vt6655: s_uGetDataDuration: Rename bLastFrag variable
>    staging: vt6655: s_uGetDataDuration: Rename uAckTime variable
>    staging: vt6655: s_uGetDataDuration: Rename uNextPktTime variable
>    staging: vt6655: s_uGetDataDuration: Fix declaration formatting
> 
>   drivers/staging/vt6655/rxtx.c | 110 ++++++++++++++++------------------
>   1 file changed, 53 insertions(+), 57 deletions(-)
> 

Hi Dominik,

now you have put quit some afford into this patch series. Thank you.

If we change the camel case variables this way we need thousands of 
patches to fix this driver. Therefore we typically change always one 
variable for the entire driver and not for one function.

The following is just my personal opinion:
You can keep working on this driver and your patches will remain in the 
git. But I think I will propose to delete this driver. Reason is that it 
supports maximum 54MBit/s and the connection is always weak. Its form 
factor is mini PCI that is really old. I use an adapter from mini PCI to 
PCI to get it into my Desktop PC. It furthermore is not buyable anymore.

I like to focus on the hardware that is really well useable and on the 
market available:

rtl8192e
150MBit/s -> 12,5MByte/s real steady transfer.
buyable for some bugs as miniPCIe Card.


rtl8723bs
150MBit/s -> >3MByte/s can be reached with the Notebook:
Odys Trendbook Next 14
(Fedora with xfce) (I would prefer the one with 4GB RAM but I have only 2GB)
buyable for not to much money.
We can catch this devices because they run on Windows 10 which will not 
be supported after fall 2025
The Driver has 146 Files with 70000 Lines. I think we can remove a lot 
because the bluetooth part is not used anymore...

There are more device drivers which need our attention...

Thanks

Bye Philipp

Re: [PATCH 00/14] staging: vt6655: Tidy up s_uGetDataDuration function

[Dominik Karol Piątkowski]

Hi Philipp,

On Wednesday, September 18th, 2024 at 23:08, Philipp Hortmann <philipp.g.hortmann@gmail.com> wrote:
<cut>
> 
> Hi Dominik,
> 
> now you have put quit some afford into this patch series. Thank you.
> 
> If we change the camel case variables this way we need thousands of
> patches to fix this driver. Therefore we typically change always one
> variable for the entire driver and not for one function.

Thank you for the insight. Indeed, this way of changing variables can
result in high number of patches in the long run. I can either rework
this series in order to clean up the variables in driver scope instead of
function scope, or apply it in future contributions.

> 
> The following is just my personal opinion:
> You can keep working on this driver and your patches will remain in the
> git. But I think I will propose to delete this driver. Reason is that it
> supports maximum 54MBit/s and the connection is always weak. Its form
> factor is mini PCI that is really old. I use an adapter from mini PCI to
> PCI to get it into my Desktop PC. It furthermore is not buyable anymore.

Oh, I see. I was not aware of the fact it is not buyable anymore.

Can I ask to be added to CC in your proposition? It is a discussion
I would like to follow.

> 
> I like to focus on the hardware that is really well useable and on the
> market available:
> 
> rtl8192e
> 150MBit/s -> 12,5MByte/s real steady transfer.
> 
> buyable for some bugs as miniPCIe Card.
> 
> 
> rtl8723bs
> 150MBit/s -> >3MByte/s can be reached with the Notebook:
> 
> Odys Trendbook Next 14
> (Fedora with xfce) (I would prefer the one with 4GB RAM but I have only 2GB)
> buyable for not to much money.
> We can catch this devices because they run on Windows 10 which will not
> be supported after fall 2025
> The Driver has 146 Files with 70000 Lines. I think we can remove a lot
> because the bluetooth part is not used anymore...

Thank you for your suggestion, I will look into them.


Thanks,

Dominik Karol

> 
> There are more device drivers which need our attention...
> 
> Thanks
> 
> Bye Philipp