staging: vt6655: some checkpatch fixes in the file rxtx.c
v3 cover staging: vt6655: some checkpatch fixes in the file rxtx.c
These fixes are focused on the function s_vFillRTSHead
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 v3 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 v3 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
Quoted 7 lines · Tanjuate Brunostar
These fixes are focused on the function
s_vFillRTSHeadv3: changed the function name from
fill_rts_headtofill_rts_headeras head is conventionally used in listsv2: changed confusing changelog messages
Quoted 8 lines
Tanjuate Brunostar (2):
staging: vt6655: change the function names_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(-)
Patch failed at 0001 staging: vt6655: change the function name s_vFillRTSHead
WARNING: line length of 138 exceeds 100 columns
#58: FILE: drivers/staging/vt6655/rxtx.c:915:
+ fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
WARNING: line length of 138 exceeds 100 columns
#67: FILE: drivers/staging/vt6655/rxtx.c:934:
+ fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
WARNING: line length of 138 exceeds 100 columns
#76: FILE: drivers/staging/vt6655/rxtx.c:948:
+ fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
May be you need to consider to break this lines.
Bye Philipp
Greg KH
maintainerQuoted 36 lines · Philipp Hortmann
Quoted 7 lines · Tanjuate Brunostar
These fixes are focused on the function
s_vFillRTSHeadv3: changed the function name from
fill_rts_headtofill_rts_headeras head is conventionally used in listsv2: changed confusing changelog messages
Quoted 8 lines
Tanjuate Brunostar (2):
staging: vt6655: change the function names_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(-)Patch failed at 0001 staging: vt6655: change the function name
s_vFillRTSHeadWARNING: line length of 138 exceeds 100 columns
#58: FILE:drivers/staging/vt6655/rxtx.c:915:(quoted diff) +1
-0+ fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK,bDisCRC, psEthHeader, wCurrentRate, byFBOption);
WARNING: line length of 138 exceeds 100 columns
#67: FILE:drivers/staging/vt6655/rxtx.c:934:(quoted diff) +1
-0+ fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK,bDisCRC, psEthHeader, wCurrentRate, byFBOption);
WARNING: line length of 138 exceeds 100 columns
#76: FILE:drivers/staging/vt6655/rxtx.c:948:(quoted diff) +1
-0+ fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK,bDisCRC, psEthHeader, wCurrentRate, byFBOption);
Quoted 1 line
May be you need to consider to break this lines.
Not in this commit, just stick to doing one thing per patch. This line is already "too long" so it is not a new problem being introduced with this change. It is fine as-is.
thanks,
greg k-h
Greg KH
maintainerQuoted 11 lines · Tanjuate Brunostar
These fixes are focused on the function
s_vFillRTSHeadv3: changed the function name from
fill_rts_headtofill_rts_headeras head is conventionally used in listsv2: changed confusing changelog messages
Tanjuate Brunostar (2):
staging: vt6655: change the function names_vFillRTSHead
staging: vt6655: Join some lines of code to avoid code lines ending in(
Neither of these changes apply to my tree. Please rebase against the staging-next branch of the staging.git tree and resend a new version.
thanks,
greg k-h