staging: vt6655: some checkpatch fixes in the file rxtx.c
v4 cover staging: vt6655: some checkpatch fixes in the file rxtx.c
These fixes are focused on the function s_vFillRTSHead
v4: rebased by codebase against the staging-next branch of the staging.git tree
v3: changed the function name from fill_rts_head to fill_rts_header as head is conventionally used in lists
v2: changed confusing changelog messages
Tanjuate Brunostar (2):
staging: vt6655: change the function name s_vFillRTSHead
staging: vt6655: 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
PATCH v4 1/2 staging: vt6655: 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
@@ -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_header- 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_header (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_header (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_header (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
PATCH v4 2/2 staging: vt6655: Join some lines of code to avoid code lines ending in (
In reply to Tanjuate BrunostarFix checkpatch error related to code line ends with a '(', by joining some lines and indenting correctly. This improves visibility
--- drivers/staging/vt6655/rxtx.c | 40 ++++++++++++++++------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/staging/vt6655/rxtx.c +18 -22
@@ -85,15 +85,15 @@ static const unsigned short fb_opt1[2][5] = {#define DATADUR_A_F1 13/*--------------------- Static Functions --------------------------*/ -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 fill_rts_header (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,
@@ -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_header (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
Re: [PATCH V4 1/2] staging: vt6655: change the function name s_vFillRTSHead
In reply to Tanjuate BrunostarQuoted 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
[]
Quoted 21 lines
drivers/staging/vt6655/rxtx.c +1
-9@@ -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_header- 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,
drivers/staging/vt6655/rxtx.c static const unsigned short fb_opt1[2][5] = { · line 96
Quoted 10 lines
drivers/staging/vt6655/rxtx.c +9
-1- 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);
Please compile the files modified by your patches _before_ submitting them.
Note the mismatch in your naming for this function prototype and the actual function.
fill_rts_head vs fill_rts_header.
I believe this was already pointed out to you by the kernel robot.
Re: [PATCH V4 1/2] staging: vt6655: change the function name s_vFillRTSHead
The second commit under this patchset resolves this. please take a look at it and let me know if I should change anything
Quoted 47 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[]
Quoted 21 lines
drivers/staging/vt6655/rxtx.c +1
-9@@ -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_header- 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,drivers/staging/vt6655/rxtx.c static const unsigned short fb_opt1[2][5] = { · line 96
Quoted 10 lines
drivers/staging/vt6655/rxtx.c +9
-1- 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);Please compile the files modified by your patches _before_ submitting them.
Note the mismatch in your naming for this function prototype and the actual function.
fill_rts_headvsfill_rts_header.I believe this was already pointed out to you by the kernel robot.
Re: [PATCH V4 1/2] staging: vt6655: change the function name s_vFillRTSHead
Quoted 3 lines · Tanju Brunostar
The second commit under this patchset resolves this. please take a look at it and let me know if I should change anything
Please don't top post on email.
http://www.catb.org/jargon/html/T/top-post.html
Don't break the kernel and then fix it in a later patch. Just fix it without first breaking it.
regards,
dan carpenter
Re: [PATCH V4 1/2] staging: vt6655: change the function name s_vFillRTSHead
Quoted 9 lines · Dan Carpenter
Quoted 3 lines · Tanju Brunostar
The second commit under this patchset resolves this. please take a look at it and let me know if I should change anything
Please don't top post on email.
http://www.catb.org/jargon/html/T/top-post.html
Oh my mistake. sorry
Quoted 6 lines
Don't break the kernel and then fix it in a later patch. Just fix it without first breaking it.
regards,
dan carpenter
I see. So I should send the changes in one patch right?