Skip to contentSkip to conversation

some checkpatch fixes in the file rxtx.c

PATCH Superseded Tanjuate Brunostar 3 participants 7 messages Nov 1, 2022 Staging

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover some checkpatch fixes in the file rxtx.c

These fixes are focused on the function s_vFillRTSHead

v2: changed confusing changelog messages

Tanjuate Brunostar (2):
change the function name s_vFillRTSHead
Join some lines of code to avoid code lines ending in (

 drivers/staging/vt6655/rxtx.c | 48 ++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 26 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/2 change the function name s_vFillRTSHead

Remove the use of Hungarian notation, which is not used in the Linux kernel. Reported by checkpatch

---
 drivers/staging/vt6655/rxtx.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/vt6655/rxtx.c +13 -13
index 31ae99b3cb35..d7e439cd8675 100644
@@ -23,7 +23,7 @@
  *      s_uGetTxRsvTime- get frame reserved time
  *      s_vFillCTSHead- fulfill CTS ctl header
  *      s_vFillFragParameter- Set fragment ctl parameter.
- *      s_vFillRTSHead- fulfill RTS ctl header
+ *      fill_rts_head- fulfill RTS ctl header
  *      s_vFillTxKey- fulfill tx encrypt key
  *      s_vSWencryption- Software encrypt header
  *      vDMA0_tx_80211- tx 802.11 frame via dma0
@@ -85,15 +85,15 @@ static const unsigned short fb_opt1[2][5] = {
 #define DATADUR_A_F1    13
 
 /*---------------------  Static Functions  --------------------------*/
-static void s_vFillRTSHead(struct vnt_private *pDevice,
-			   unsigned char byPktType,
-			   void *pvRTS,
-			   unsigned int	cbFrameLength,
-			   bool bNeedAck,
-			   bool bDisCRC,
-			   struct ieee80211_hdr *hdr,
-			   unsigned short wCurrentRate,
-			   unsigned char byFBOption);
+static void fill_rts_head(struct vnt_private *pDevice,
+			  unsigned char byPktType,
+			  void *pvRTS,
+			  unsigned int	cbFrameLength,
+			  bool bNeedAck,
+			  bool bDisCRC,
+			  struct ieee80211_hdr *hdr,
+			  unsigned short wCurrentRate,
+			  unsigned char byFBOption);
 
 static void s_vGenerateTxParameter(struct vnt_private *pDevice,
 				   unsigned char byPktType,
@@ -912,7 +912,7 @@ s_vGenerateTxParameter(
 			buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
 			buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
 
-			s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
+			fill_rts_head(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
 		} else {/* RTS_needless, PCF mode */
 			struct vnt_rrv_time_cts *buf = pvRrvTime;
 
@@ -931,7 +931,7 @@ s_vGenerateTxParameter(
 			buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
 
 			/* Fill RTS */
-			s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
+			fill_rts_head(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
 		} else if (!pvRTS) {/* RTS_needless, non PCF mode */
 			struct vnt_rrv_time_ab *buf = pvRrvTime;
 
@@ -945,7 +945,7 @@ s_vGenerateTxParameter(
 			buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
 
 			/* Fill RTS */
-			s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
+			fill_rts_head(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
 		} else { /* RTS_needless, non PCF mode */
 			struct vnt_rrv_time_ab *buf = pvRrvTime;
 
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH v2 1/2] change the function name s_vFillRTSHead

Quoted 2 lines · Tanjuate Brunostar

Remove the use of Hungarian notation, which is not used in the Linux kernel. Reported by checkpatch

[]

drivers/staging/vt6655/rxtx.c

Quoted 1 line
drivers/staging/vt6655/rxtx.c +0 -0

[]

drivers/staging/vt6655/rxtx.c line 26

Quoted 6 lines
drivers/staging/vt6655/rxtx.c +1 -1
@@ -23,7 +23,7 @@
  *      s_uGetTxRsvTime- get frame reserved time
  *      s_vFillCTSHead- fulfill CTS ctl header
  *      s_vFillFragParameter- Set fragment ctl parameter.
- *      s_vFillRTSHead- fulfill RTS ctl header
+ *      fill_rts_head- fulfill RTS ctl header

Perhaps use header as head is conventionally used in lists.

fill_rts_header

#3 lore raw

Re: [PATCH v2 1/2] change the function name s_vFillRTSHead

Quoted 16 lines · Joe Perches
Quoted 2 lines · Tanjuate Brunostar

Remove the use of Hungarian notation, which is not used in the Linux kernel. Reported by checkpatch

[]

drivers/staging/vt6655/rxtx.c

Quoted 1 line
drivers/staging/vt6655/rxtx.c +0 -0

[]

drivers/staging/vt6655/rxtx.c line 26

Quoted 6 lines
drivers/staging/vt6655/rxtx.c +1 -1
@@ -23,7 +23,7 @@
  *      s_uGetTxRsvTime- get frame reserved time
  *      s_vFillCTSHead- fulfill CTS ctl header
  *      s_vFillFragParameter- Set fragment ctl parameter.
- *      s_vFillRTSHead- fulfill RTS ctl header
+ *      fill_rts_head- fulfill RTS ctl header

Perhaps use header as head is conventionally used in lists.

Quoted 2 lines

fill_rts_header

OK, thanks

#4 lore raw

PATCH v2 2/2 Join some lines of code to avoid code lines ending in (

In reply to Tanjuate Brunostar

Fix checkpatch error related to code line ends with a '(', by joining some lines and indenting correctly. This improves visibility

---
 drivers/staging/vt6655/rxtx.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/staging/vt6655/rxtx.c +9 -13
index d7e439cd8675..df7473155704 100644
@@ -555,19 +555,15 @@ s_uFillDataHead(
 	return buf->duration;
 }
 
-static
-void
-s_vFillRTSHead(
-	struct vnt_private *pDevice,
-	unsigned char byPktType,
-	void *pvRTS,
-	unsigned int cbFrameLength,
-	bool bNeedAck,
-	bool bDisCRC,
-	struct ieee80211_hdr *hdr,
-	unsigned short wCurrentRate,
-	unsigned char byFBOption
-)
+static void fill_rts_head(struct vnt_private *pDevice,
+			  unsigned char byPktType,
+			  void *pvRTS,
+			  unsigned int cbFrameLength,
+			  bool bNeedAck,
+			  bool bDisCRC,
+			  struct ieee80211_hdr *hdr,
+			  unsigned short wCurrentRate,
+			  unsigned char byFBOption)
 {
 	unsigned int uRTSFrameLen = 20;
 
Signature · 1 line
2.34.1
maintainer
#5 lore raw
In reply to Tanjuate Brunostar
Quoted 10 lines · Tanjuate Brunostar

These fixes are focused on the function s_vFillRTSHead

v2: changed confusing changelog messages

Tanjuate Brunostar (2):
change the function name s_vFillRTSHead
Join some lines of code to avoid code lines ending in (

 drivers/staging/vt6655/rxtx.c | 48 ++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

Please look at your subject lines you are using here, and look at the mailing list for previous patch submissions, and at the git log for this file, and fix them up to have the proper prefixes on them.

As is, I can't take these.

thanks,

greg k-h

#6 lore raw
Quoted 17 lines · Greg KH
Quoted 10 lines · Tanjuate Brunostar

These fixes are focused on the function s_vFillRTSHead

v2: changed confusing changelog messages

Tanjuate Brunostar (2):
change the function name s_vFillRTSHead
Join some lines of code to avoid code lines ending in (

 drivers/staging/vt6655/rxtx.c | 48 ++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

Please look at your subject lines you are using here, and look at the mailing list for previous patch submissions, and at the git log for this file, and fix them up to have the proper prefixes on them.

Quoted 5 lines

As is, I can't take these.

thanks,

greg k-h

There is a version 3 of this. Please review it instead

thanks

Tanju