Skip to contentSkip to conversation

staging: vt6655: Rename byPreambleType field

PATCH Superseded Karolina Drobnik 2 participants 4 messages Oct 15, 2021 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: vt6655: Rename byPreambleType field

Drop Hungarian notation prefix in byPreambleType member of struct vnt_private. Change it to use snake case. Update comment for bb_get_frame_time to reflect that change.

Fix issue detected by checkpatch.pl:
CHECK: Avoid CamelCase: <byPreambleType>

---
 drivers/staging/vt6655/baseband.c    |  8 ++---
 drivers/staging/vt6655/baseband.h    |  2 +-
 drivers/staging/vt6655/device.h      |  2 +-
 drivers/staging/vt6655/device_main.c |  8 ++---
 drivers/staging/vt6655/rxtx.c        | 50 ++++++++++++++--------------
 5 files changed, 35 insertions(+), 35 deletions(-)
drivers/staging/vt6655/baseband.c +4 -4
index 0bae35af6e0f..7a5f186f2598 100644
@@ -1691,7 +1691,7 @@ static const unsigned short awc_frame_time[MAX_RATE] = {
  *
  * Parameters:
  *  In:
- *      by_preamble_type  - Preamble Type
+ *      preamble_type     - Preamble Type
  *      by_pkt_type        - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
  *      cb_frame_length   - Baseband Type
  *      tx_rate           - Tx Rate
@@ -1700,7 +1700,7 @@ static const unsigned short awc_frame_time[MAX_RATE] = {
  * Return Value: FrameTime
  *
  */
-unsigned int bb_get_frame_time(unsigned char by_preamble_type,
+unsigned int bb_get_frame_time(unsigned char preamble_type,
 			       unsigned char by_pkt_type,
 			       unsigned int cb_frame_length,
 			       unsigned short tx_rate)
@@ -1717,7 +1717,7 @@ unsigned int bb_get_frame_time(unsigned char by_preamble_type,
 	rate = (unsigned int)awc_frame_time[rate_idx];
 
 	if (rate_idx <= 3) {		    /* CCK mode */
-		if (by_preamble_type == 1) /* Short */
+		if (preamble_type == 1)     /* Short */
 			preamble = 96;
 		else
 			preamble = 192;
@@ -1764,7 +1764,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
 	u32 count = 0;
 	u32 tmp;
 	int ext_bit;
-	u8 preamble_type = priv->byPreambleType;
+	u8 preamble_type = priv->preamble_type;
 
 	bit_count = frame_length * 8;
 	ext_bit = false;
drivers/staging/vt6655/baseband.h +1 -1
index 0a30afaa7cc3..15b2802ed727 100644
@@ -44,7 +44,7 @@
 #define TOP_RATE_2M         0x00200000
 #define TOP_RATE_1M         0x00100000
 
-unsigned int bb_get_frame_time(unsigned char by_preamble_type,
+unsigned int bb_get_frame_time(unsigned char preamble_type,
 			       unsigned char by_pkt_type,
 			       unsigned int cb_frame_length,
 			       unsigned short w_rate);
drivers/staging/vt6655/device.h +1 -1
index 92d6f82f939f..4706bde1ec1d 100644
@@ -203,7 +203,7 @@ struct vnt_private {
 	unsigned char byMinChannel;
 	unsigned char byMaxChannel;
 
-	unsigned char byPreambleType;
+	unsigned char preamble_type;
 	unsigned char byShortPreamble;
 
 	unsigned short wCurrentRate;
drivers/staging/vt6655/device_main.c +4 -4
index 24f0e346da12..212d2a287b2c 100644
@@ -177,11 +177,11 @@ device_set_options(struct vnt_private *priv)
 	priv->byPacketType = priv->byBBType;
 	priv->byAutoFBCtrl = AUTO_FB_0;
 	priv->bUpdateBBVGA = true;
-	priv->byPreambleType = 0;
+	priv->preamble_type = 0;
 
 	pr_debug(" byShortRetryLimit= %d\n", (int)priv->byShortRetryLimit);
 	pr_debug(" byLongRetryLimit= %d\n", (int)priv->byLongRetryLimit);
-	pr_debug(" byPreambleType= %d\n", (int)priv->byPreambleType);
+	pr_debug(" preamble_type= %d\n", (int)priv->preamble_type);
 	pr_debug(" byShortPreamble= %d\n", (int)priv->byShortPreamble);
 	pr_debug(" byBBType= %d\n", (int)priv->byBBType);
 }
@@ -1424,10 +1424,10 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
 	if (changed & BSS_CHANGED_ERP_PREAMBLE) {
 		if (conf->use_short_preamble) {
 			MACvEnableBarkerPreambleMd(priv->port_offset);
-			priv->byPreambleType = true;
+			priv->preamble_type = true;
 		} else {
 			MACvDisableBarkerPreambleMd(priv->port_offset);
-			priv->byPreambleType = false;
+			priv->preamble_type = false;
 		}
 	}
 
drivers/staging/vt6655/rxtx.c +25 -25

143 lines not on this page · raw message

Signature · 1 line
2.30.2
maintainer
#1 lore raw
Quoted 21 lines · Karolina Drobnik

Drop Hungarian notation prefix in byPreambleType member of struct vnt_private. Change it to use snake case. Update comment for bb_get_frame_time to reflect that change.

Fix issue detected by checkpatch.pl:
CHECK: Avoid CamelCase: <byPreambleType>

---
 drivers/staging/vt6655/baseband.c    |  8 ++---
 drivers/staging/vt6655/baseband.h    |  2 +-
 drivers/staging/vt6655/device.h      |  2 +-
 drivers/staging/vt6655/device_main.c |  8 ++---
 drivers/staging/vt6655/rxtx.c        | 50 ++++++++++++++--------------
 5 files changed, 35 insertions(+), 35 deletions(-)
drivers/staging/vt6655/baseband.c +0 -0
index 0bae35af6e0f..7a5f186f2598 100644

drivers/staging/vt6655/baseband.c static const unsigned short awc_frame_time[MAX_RATE] = { · line 1694

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
@@ -1691,7 +1691,7 @@ static const unsigned short awc_frame_time[MAX_RATE] = {
  *
  * Parameters:
  *  In:
- *      by_preamble_type  - Preamble Type
+ *      preamble_type     - Preamble Type

This is not part of a structure.

drivers/staging/vt6655/baseband.c static const unsigned short awc_frame_time[MAX_RATE] = { · line 1703

Quoted 9 lines
drivers/staging/vt6655/baseband.c +1 -1
  *      by_pkt_type        - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
  *      cb_frame_length   - Baseband Type
  *      tx_rate           - Tx Rate
@@ -1700,7 +1700,7 @@ static const unsigned short awc_frame_time[MAX_RATE] = {
  * Return Value: FrameTime
  *
  */
-unsigned int bb_get_frame_time(unsigned char by_preamble_type,
+unsigned int bb_get_frame_time(unsigned char preamble_type,

Neither is this :(

Do not do multiple different things in the same commit and especially when you do not describe them in the changelog text.

thanks,

greg k-h

#2 lore raw

Hi Greg,

Quoted 2 lines · Greg KH

Do not do multiple different things in the same commit and especially when you do not describe them in the changelog text.

I wasn't aware that changing this preamble-related variable would be counted as a different thing. It makes sense, my bad.

Would you like me to amend the message to say that I also changed bb_get_frame_time parameter or just drop this change completely?

Is there anything else I should address in my v3 patch?

Thanks,
Karolina

maintainer
#3 lore raw
Quoted 11 lines · Karolina Drobnik

Hi Greg,

Quoted 2 lines · Greg KH

Do not do multiple different things in the same commit and especially when you do not describe them in the changelog text.

I wasn't aware that changing this preamble-related variable would be counted as a different thing. It makes sense, my bad.

Would you like me to amend the message to say that I also changed bb_get_frame_time parameter or just drop this change completely?

I think I already answered this :)