Rename variable bUpdateBBVGA, byCurrentCh, byCurPwr and byBBPreEDRSSI
cover Rename variable bUpdateBBVGA, byCurrentCh, byCurPwr and byBBPreEDRSSI
Make the variable names adhere to Linux kernel coding style and mute checkpatch.pl errors.
Gilbert Adikankwu (4):
staging: vt6655: Rename variable bUpdateBBVGA
staging: vt6655: Rename variable byCurrentCh
staging: vt6655: Rename variable byCurPwr
staging: vt6655: Rename variable byBBPreEDRSSI
drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 18 +++++++++--------- drivers/staging/vt6655/device.h | 8 ++++---- drivers/staging/vt6655/device_main.c | 8 ++++---- drivers/staging/vt6655/dpc.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/4 staging: vt6655: Rename variable bUpdateBBVGA
Remove bool Type encoding "b" from variable name and replace camelcase with snakecase.
Mute checkpatch.pl error:
CHECK: Avoid CamelCase: <bUpdateBBVGA>
--- drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/vt6655/baseband.c +1 -1
@@ -2087,7 +2087,7 @@ bool bb_vt3253_init(struct vnt_private *priv)/* {{ RobertYu: 20050104 */ }else {/* No VGA Table now */ - priv->bUpdateBBVGA = false; + priv->update_bbvga = false; priv->bbvga[0 ] =0x1C ; }
drivers/staging/vt6655/channel.c +1 -1
@@ -86,7 +86,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)return ret;/* Set VGA to max sensitivity */ -if (priv->bUpdateBBVGA && +if (priv->update_bbvga && priv->bbvga_current != priv->bbvga[0 ]) { priv->bbvga_current = priv->bbvga[0 ];
drivers/staging/vt6655/device.h +1 -1
@@ -246,7 +246,7 @@ struct vnt_private {unsigned char byAutoFBCtrl;/* For Update BaseBand VGA Gain Offset */ -bool bUpdateBBVGA; +bool update_bbvga;unsigned int uBBVGADiffCount;unsigned char bbvga_new;unsigned char bbvga_current;
drivers/staging/vt6655/device_main.c +3 -3
@@ -179,7 +179,7 @@ device_set_options(struct vnt_private *priv) priv->byBBType = priv->opts.bbp_type; priv->byPacketType = priv->byBBType; priv->byAutoFBCtrl =AUTO_FB_0 ; - priv->bUpdateBBVGA = true; + priv->update_bbvga = true; priv->preamble_type =0 ;pr_debug (" byShortRetryLimit= %d\n" , (int )priv->byShortRetryLimit);
@@ -423,7 +423,7 @@ static void device_init_registers(struct vnt_private *priv)/* initialize BBP registers */ bb_vt3253_init (priv); -if (priv->bUpdateBBVGA) { +if (priv->update_bbvga) { priv->bbvga_current = priv->bbvga[0 ]; priv->bbvga_new = priv->bbvga_current;bb_set_vga_gain_offset (priv, priv->bbvga[0 ]);
@@ -1040,7 +1040,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)long dbm;int i; -if (!priv->bUpdateBBVGA) +if (!priv->update_bbvga)return ;if (priv->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL )
Signature · 1 line
2.34.1
PATCH 2/4 staging: vt6655: Rename variable byCurrentCh
In reply to Gilbert AdikankwuRemove byte Type encoding "by" from variable name and replace camelcase with snakecase.
Mute checkpatch.pl error:
CHECK: Avoid CamelCase: <byCurrentCh>
--- drivers/staging/vt6655/channel.c | 12 ++++++------ drivers/staging/vt6655/device.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/vt6655/channel.c +6 -6
@@ -82,7 +82,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) {bool ret = true; -if (priv->byCurrentCh == ch->hw_value) +if (priv->current_ch == ch->hw_value)return ret;/* Set VGA to max sensitivity */
@@ -100,7 +100,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)* it is for better TX throughput */ - priv->byCurrentCh = ch->hw_value; + priv->current_ch = ch->hw_value; ret &=RFbSelectChannel (priv, priv->rf_type, ch->hw_value);
@@ -117,9 +117,9 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)/* set HW default power register */ VT6655_MAC_SELECT_PAGE1 (priv->port_offset); -RFbSetPower (priv,RATE_1M , priv->byCurrentCh); +RFbSetPower (priv,RATE_1M , priv->current_ch);iowrite8 (priv->byCurPwr, priv->port_offset +MAC_REG_PWRCCK ); -RFbSetPower (priv,RATE_6M , priv->byCurrentCh); +RFbSetPower (priv,RATE_6M , priv->current_ch);iowrite8 (priv->byCurPwr, priv->port_offset +MAC_REG_PWROFDM );VT6655_MAC_SELECT_PAGE0 (priv->port_offset);
@@ -127,9 +127,9 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) }if (priv->byBBType ==BB_TYPE_11B ) -RFbSetPower (priv,RATE_1M , priv->byCurrentCh); +RFbSetPower (priv,RATE_1M , priv->current_ch);else -RFbSetPower (priv,RATE_6M , priv->byCurrentCh); +RFbSetPower (priv,RATE_6M , priv->current_ch);return ret; }
drivers/staging/vt6655/device.h +1 -1
@@ -239,7 +239,7 @@ struct vnt_private {bool bIsBeaconBufReadySet;unsigned int cbBeaconBufReadySetCnt;bool bFixRate; -u16 byCurrentCh; +u16 current_ch;bool bAES;
Signature · 1 line
2.34.1
PATCH 3/4 staging: vt6655: Rename variable byCurPwr
In reply to Gilbert AdikankwuRemove byte Type encoding "by" from variable name and replace camelcase with snakecase
Mute checkpatch.pl error:
CHECK: Avoid CamelCase: <byCurPwr>
--- drivers/staging/vt6655/channel.c | 4 ++-- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/vt6655/channel.c +2 -2
@@ -118,9 +118,9 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)/* set HW default power register */ VT6655_MAC_SELECT_PAGE1 (priv->port_offset);RFbSetPower (priv,RATE_1M , priv->current_ch); -iowrite8 (priv->byCurPwr, priv->port_offset +MAC_REG_PWRCCK ); +iowrite8 (priv->cur_pwr, priv->port_offset +MAC_REG_PWRCCK );RFbSetPower (priv,RATE_6M , priv->current_ch); -iowrite8 (priv->byCurPwr, priv->port_offset +MAC_REG_PWROFDM ); +iowrite8 (priv->cur_pwr, priv->port_offset +MAC_REG_PWROFDM );VT6655_MAC_SELECT_PAGE0 (priv->port_offset);spin_unlock_irqrestore (&priv->lock, flags);
drivers/staging/vt6655/device.h +1 -1
@@ -264,7 +264,7 @@ struct vnt_private {/* For RF Power table */ unsigned char byCCKPwr;unsigned char byOFDMPwrG; -unsigned char byCurPwr; +unsigned char cur_pwr;char byCurPwrdBm;unsigned char abyCCKPwrTbl[CB_MAX_CHANNEL_24G +1 ];unsigned char abyOFDMPwrTbl[CB_MAX_CHANNEL +1 ];
drivers/staging/vt6655/device_main.c +1 -1
@@ -359,7 +359,7 @@ static void device_init_registers(struct vnt_private *priv)RFbInit (priv);/* Get Desire Power Value */ - priv->byCurPwr =0xFF ; + priv->cur_pwr =0xFF ; priv->byCCKPwr =SROMbyReadEmbedded (priv->port_offset,EEP_OFS_PWR_CCK ); priv->byOFDMPwrG =SROMbyReadEmbedded (priv->port_offset,EEP_OFS_PWR_OFDMG );
drivers/staging/vt6655/rf.c +2 -2
@@ -438,12 +438,12 @@ bool RFbSetPower(struct vnt_private *priv, unsigned int rate, u16 uCH)break ; } -if (priv->byCurPwr == byPwr) +if (priv->cur_pwr == byPwr)return true; ret =RFbRawSetPower (priv, byPwr, rate);if (ret) - priv->byCurPwr = byPwr; + priv->cur_pwr = byPwr;return ret; }
Signature · 1 line
2.34.1
PATCH 4/4 staging: vt6655: Rename variable byBBPreEDRSSI
In reply to Gilbert AdikankwuRemove byte Type encoding "by" from variable name and replace camelcase with snakecase.
Mute checkpatch error:
CHECK: Avoid CamelCase: <byBBPreEDRSSI>
--- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/dpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vt6655/device.h +1 -1
@@ -253,7 +253,7 @@ struct vnt_private {unsigned char bbvga[BB_VGA_LEVEL ];long dbm_threshold[BB_VGA_LEVEL ]; -unsigned char byBBPreEDRSSI; +unsigned char bb_pre_edrssi;unsigned char byBBPreEDIndex;unsigned long dwDiagRefCount;
drivers/staging/vt6655/dpc.c +1 -1
@@ -79,7 +79,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,RFvRSSITodBm (priv, *rssi, &rx_dbm); - priv->byBBPreEDRSSI = (u8 )rx_dbm +1 ; + priv->bb_pre_edrssi = (u8 )rx_dbm +1 ; priv->current_rssi = *rssi;skb_pull (skb,4 );
Signature · 1 line
2.34.1
Re: [PATCH 1/4] staging: vt6655: Rename variable bUpdateBBVGA
In reply to Gilbert AdikankwuQuoted 20 lines · Gilbert Adikankwu
Remove bool Type encoding "b" from variable name and replace camelcase with snakecase.
Mute checkpatch.pl error:
CHECK: Avoid CamelCase: <bUpdateBBVGA>
Signed-off-by Gilbert Adikankwu <[email protected]>--- drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)drivers/staging/vt6655/baseband.c +0
-0
drivers/staging/vt6655/baseband.c bool bb_vt3253_init(struct vnt_private *priv) · line 2091
Quoted 6 lines
drivers/staging/vt6655/baseband.c +1
-1@@ -2087,7 +2087,7 @@ bool bb_vt3253_init(struct vnt_private *priv)/* {{ RobertYu: 20050104 */ }else {/* No VGA Table now */ - priv->bUpdateBBVGA = false; + priv->update_bbvga = false; priv->bbvga[0 ] =0x1C ;
I wonder about the name bbvga in the line above. Does the initial b mean byte or is it a lowercase version of BBVGA?
julia
Quoted 64 lines
drivers/staging/vt6655/baseband.c +0
-0}drivers/staging/vt6655/channel.c +1
-1@@ -86,7 +86,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)return ret;/* Set VGA to max sensitivity */ -if (priv->bUpdateBBVGA && +if (priv->update_bbvga && priv->bbvga_current != priv->bbvga[0 ]) { priv->bbvga_current = priv->bbvga[0 ];drivers/staging/vt6655/device.h +1
-1@@ -246,7 +246,7 @@ struct vnt_private {unsigned char byAutoFBCtrl;/* For Update BaseBand VGA Gain Offset */ -bool bUpdateBBVGA; +bool update_bbvga;unsigned int uBBVGADiffCount;unsigned char bbvga_new;unsigned char bbvga_current;drivers/staging/vt6655/device_main.c +3
-4@@ -179,7 +179,7 @@ device_set_options(struct vnt_private *priv) priv->byBBType = priv->opts.bbp_type; priv->byPacketType = priv->byBBType; priv->byAutoFBCtrl =AUTO_FB_0 ; - priv->bUpdateBBVGA = true; + priv->update_bbvga = true; priv->preamble_type =0 ;pr_debug (" byShortRetryLimit= %d\n" , (int )priv->byShortRetryLimit);@@ -423,7 +423,7 @@ static void device_init_registers(struct vnt_private *priv)/* initialize BBP registers */ bb_vt3253_init (priv); -if (priv->bUpdateBBVGA) { +if (priv->update_bbvga) { priv->bbvga_current = priv->bbvga[0 ]; priv->bbvga_new = priv->bbvga_current;bb_set_vga_gain_offset (priv, priv->bbvga[0 ]);@@ -1040,7 +1040,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)long dbm;int i; -if (!priv->bUpdateBBVGA) +if (!priv->update_bbvga)return ;if (priv->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) --2.34.1
Quoted 9 lines · Gilbert Adikankwu
Make the variable names adhere to Linux kernel coding style and mute checkpatch.pl errors.
Gilbert Adikankwu (4):
staging: vt6655: Rename variable bUpdateBBVGA
staging: vt6655: Rename variable byCurrentCh
staging: vt6655: Rename variable byCurPwr
staging: vt6655: Rename variable byBBPreEDRSSI
Quoted 8 lines
drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 18 +++++++++--------- drivers/staging/vt6655/device.h | 8 ++++---- drivers/staging/vt6655/device_main.c | 8 ++++---- drivers/staging/vt6655/dpc.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-)
Hi,
- if (priv->byCurrentCh == ch->hw_value)
+ if (priv->current_ch == ch->hw_value)^M
return ret;
ERROR: DOS line endings
What does the "^M" at the end of the new line?
Did you run checkpatch on your patches?
Thanks
Bye
Philipp
Quoted 27 lines · Philipp Hortmann
Quoted 9 lines · Gilbert Adikankwu
Make the variable names adhere to Linux kernel coding style and mute checkpatch.pl errors.
Gilbert Adikankwu (4):
staging: vt6655: Rename variable bUpdateBBVGA
staging: vt6655: Rename variable byCurrentCh
staging: vt6655: Rename variable byCurPwr
staging: vt6655: Rename variable byBBPreEDRSSIQuoted 8 lines
drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 18 +++++++++--------- drivers/staging/vt6655/device.h | 8 ++++---- drivers/staging/vt6655/device_main.c | 8 ++++---- drivers/staging/vt6655/dpc.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-)Hi,
(quoted diff) +1
-1- if (priv->byCurrentCh == ch->hw_value) + if (priv->current_ch == ch->hw_value)^M return ret;ERROR: DOS line endings
Quoted 8 lines
What does the "^M" at the end of the new line?
Did you run checkpatch on your patches?Thanks
Bye
Philipp
Hello,
I do not know what this error means. If anything, I'm surprised there is an error. checkpatch is hooked to my git commit and all the patches built cleanly on my machine. I will resend now.
Thanks
Gilbert
Re: [PATCH 1/4] staging: vt6655: Rename variable bUpdateBBVGA
In reply to Julia LawallQuoted 34 lines · Julia Lawall
Quoted 20 lines · Gilbert Adikankwu
Remove bool Type encoding "b" from variable name and replace camelcase with snakecase.
Mute checkpatch.pl error:
CHECK: Avoid CamelCase: <bUpdateBBVGA>
Signed-off-by Gilbert Adikankwu <[email protected]>--- drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)drivers/staging/vt6655/baseband.c +0
-0drivers/staging/vt6655/baseband.c bool bb_vt3253_init(struct vnt_private *priv) · line 2091
Quoted 6 lines
drivers/staging/vt6655/baseband.c +1
-1@@ -2087,7 +2087,7 @@ bool bb_vt3253_init(struct vnt_private *priv)/* {{ RobertYu: 20050104 */ }else {/* No VGA Table now */ - priv->bUpdateBBVGA = false; + priv->update_bbvga = false; priv->bbvga[0 ] =0x1C ;I wonder about the name bbvga in the line above. Does the initial b mean byte or is it a lowercase version of BBVGA?
Quoted 1 line
julia
Hello,
bbvga is lowercase version of BBGVA. It was added with this commit 11b896e65f4bff7e412b3abca366ea0bdadc8834
Thanks
Gilbert
Quoted 65 lines
Quoted 65 lines
drivers/staging/vt6655/baseband.c +0
-0}drivers/staging/vt6655/channel.c +1
-1@@ -86,7 +86,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)return ret;/* Set VGA to max sensitivity */ -if (priv->bUpdateBBVGA && +if (priv->update_bbvga && priv->bbvga_current != priv->bbvga[0 ]) { priv->bbvga_current = priv->bbvga[0 ];drivers/staging/vt6655/device.h +1
-1@@ -246,7 +246,7 @@ struct vnt_private {unsigned char byAutoFBCtrl;/* For Update BaseBand VGA Gain Offset */ -bool bUpdateBBVGA; +bool update_bbvga;unsigned int uBBVGADiffCount;unsigned char bbvga_new;unsigned char bbvga_current;drivers/staging/vt6655/device_main.c +3
-4@@ -179,7 +179,7 @@ device_set_options(struct vnt_private *priv) priv->byBBType = priv->opts.bbp_type; priv->byPacketType = priv->byBBType; priv->byAutoFBCtrl =AUTO_FB_0 ; - priv->bUpdateBBVGA = true; + priv->update_bbvga = true; priv->preamble_type =0 ;pr_debug (" byShortRetryLimit= %d\n" , (int )priv->byShortRetryLimit);@@ -423,7 +423,7 @@ static void device_init_registers(struct vnt_private *priv)/* initialize BBP registers */ bb_vt3253_init (priv); -if (priv->bUpdateBBVGA) { +if (priv->update_bbvga) { priv->bbvga_current = priv->bbvga[0 ]; priv->bbvga_new = priv->bbvga_current;bb_set_vga_gain_offset (priv, priv->bbvga[0 ]);@@ -1040,7 +1040,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)long dbm;int i; -if (!priv->bUpdateBBVGA) +if (!priv->update_bbvga)return ;if (priv->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) --2.34.1
Re: [PATCH 1/4] staging: vt6655: Rename variable bUpdateBBVGA
Quoted 35 lines · Gilbert Adikankwu
Quoted 34 lines · Julia Lawall
Quoted 20 lines · Gilbert Adikankwu
Remove bool Type encoding "b" from variable name and replace camelcase with snakecase.
Mute checkpatch.pl error:
CHECK: Avoid CamelCase: <bUpdateBBVGA>
Signed-off-by Gilbert Adikankwu <[email protected]>--- drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)drivers/staging/vt6655/baseband.c +0
-0drivers/staging/vt6655/baseband.c bool bb_vt3253_init(struct vnt_private *priv) · line 2091
Quoted 6 lines
drivers/staging/vt6655/baseband.c +1
-1@@ -2087,7 +2087,7 @@ bool bb_vt3253_init(struct vnt_private *priv)/* {{ RobertYu: 20050104 */ }else {/* No VGA Table now */ - priv->bUpdateBBVGA = false; + priv->update_bbvga = false; priv->bbvga[0 ] =0x1C ;I wonder about the name bbvga in the line above. Does the initial b mean byte or is it a lowercase version of BBVGA?
Quoted 5 lines
Quoted 1 line
julia
Hello,
bbvga is lowercase version of BBGVA. It was added with this commit
11b896e65f4bff7e412b3abca366ea0bdadc8834
OK thanks for the confirmation.
julia
Quoted 70 lines
Thanks
GilbertQuoted 65 lines
Quoted 65 lines
drivers/staging/vt6655/baseband.c +0
-0}drivers/staging/vt6655/channel.c +1
-1@@ -86,7 +86,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)return ret;/* Set VGA to max sensitivity */ -if (priv->bUpdateBBVGA && +if (priv->update_bbvga && priv->bbvga_current != priv->bbvga[0 ]) { priv->bbvga_current = priv->bbvga[0 ];drivers/staging/vt6655/device.h +1
-1@@ -246,7 +246,7 @@ struct vnt_private {unsigned char byAutoFBCtrl;/* For Update BaseBand VGA Gain Offset */ -bool bUpdateBBVGA; +bool update_bbvga;unsigned int uBBVGADiffCount;unsigned char bbvga_new;unsigned char bbvga_current;drivers/staging/vt6655/device_main.c +3
-4@@ -179,7 +179,7 @@ device_set_options(struct vnt_private *priv) priv->byBBType = priv->opts.bbp_type; priv->byPacketType = priv->byBBType; priv->byAutoFBCtrl =AUTO_FB_0 ; - priv->bUpdateBBVGA = true; + priv->update_bbvga = true; priv->preamble_type =0 ;pr_debug (" byShortRetryLimit= %d\n" , (int )priv->byShortRetryLimit);@@ -423,7 +423,7 @@ static void device_init_registers(struct vnt_private *priv)/* initialize BBP registers */ bb_vt3253_init (priv); -if (priv->bUpdateBBVGA) { +if (priv->update_bbvga) { priv->bbvga_current = priv->bbvga[0 ]; priv->bbvga_new = priv->bbvga_current;bb_set_vga_gain_offset (priv, priv->bbvga[0 ]);@@ -1040,7 +1040,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)long dbm;int i; -if (!priv->bUpdateBBVGA) +if (!priv->update_bbvga)return ;if (priv->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) --2.34.1
Quoted 4 lines · Gilbert Adikankwu
Quoted 3 lines · Philipp Hortmann
Quoted 2 lines · Gilbert Adikankwu
Make the variable names adhere to Linux kernel coding style and mute checkpatch.pl errors.
A small nit from my side -- "mute" suggests that you suppressed the warning/error, but your changes fix them, so why now say "fix checkpatch.pl errors"?
Quoted 31 lines
Quoted 31 lines
Quoted 7 lines
Gilbert Adikankwu (4):
staging: vt6655: Rename variable bUpdateBBVGA
staging: vt6655: Rename variable byCurrentCh
staging: vt6655: Rename variable byCurPwr
staging: vt6655: Rename variable byBBPreEDRSSIQuoted 8 lines
drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 18 +++++++++--------- drivers/staging/vt6655/device.h | 8 ++++---- drivers/staging/vt6655/device_main.c | 8 ++++---- drivers/staging/vt6655/dpc.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-)Hi,
(quoted diff) +1
-1- if (priv->byCurrentCh == ch->hw_value) + if (priv->current_ch == ch->hw_value)^M return ret;ERROR: DOS line endings
What does the "^M" at the end of the new line?
Did you run checkpatch on your patches?Thanks
Bye
Quoted 7 lines
Quoted 1 line
Philipp
Hello,
I do not know what this error means. If anything, I'm surprised there is an error. checkpatch is hooked to my git commit and all the patches built cleanly on my machine. I will resend now.
I'm not seeing that error when the patch is applied. You could double-check the patch files before sending by calling checkpatch.pl on them directly.
This could be also because of how some email clients change the endings on download, like Thunderbird, and the patch itself might be fine.
All the best,
Karolina
Quoted 4 lines
Thanks
Gilbert
Greg KH
maintainerQuoted 25 lines · Philipp Hortmann
Quoted 9 lines · Gilbert Adikankwu
Make the variable names adhere to Linux kernel coding style and mute checkpatch.pl errors.
Gilbert Adikankwu (4):
staging: vt6655: Rename variable bUpdateBBVGA
staging: vt6655: Rename variable byCurrentCh
staging: vt6655: Rename variable byCurPwr
staging: vt6655: Rename variable byBBPreEDRSSIQuoted 8 lines
drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 18 +++++++++--------- drivers/staging/vt6655/device.h | 8 ++++---- drivers/staging/vt6655/device_main.c | 8 ++++---- drivers/staging/vt6655/dpc.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-)Hi,
(quoted diff) +1
-1- if (priv->byCurrentCh == ch->hw_value) + if (priv->current_ch == ch->hw_value)^M return ret;
Quoted 4 lines
ERROR: DOS line endings
What does the "^M" at the end of the new line?
Did you run checkpatch on your patches?
I don't see that on my side, are you sure this is there?
thanks,
greg k-h
Quoted 28 lines · Greg KH
Quoted 27 lines · Philipp Hortmann
Quoted 9 lines · Gilbert Adikankwu
Make the variable names adhere to Linux kernel coding style and mute checkpatch.pl errors.
Gilbert Adikankwu (4):
staging: vt6655: Rename variable bUpdateBBVGA
staging: vt6655: Rename variable byCurrentCh
staging: vt6655: Rename variable byCurPwr
staging: vt6655: Rename variable byBBPreEDRSSIQuoted 8 lines
drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/channel.c | 18 +++++++++--------- drivers/staging/vt6655/device.h | 8 ++++---- drivers/staging/vt6655/device_main.c | 8 ++++---- drivers/staging/vt6655/dpc.c | 2 +- drivers/staging/vt6655/rf.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-)Hi,
(quoted diff) +1
-1- if (priv->byCurrentCh == ch->hw_value) + if (priv->current_ch == ch->hw_value)^M return ret;ERROR: DOS line endings
Quoted 8 lines
Quoted 2 lines
What does the "^M" at the end of the new line?
Did you run checkpatch on your patches?I don't see that on my side, are you sure this is there?
thanks,
greg k-h
Hi,
as previously assumed: yes I saved the email from Thunderbird to Downloads:
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply --reject --ignore-space-change --ignore-whitespace ~/Downloads/\[PATCH\ 1* Checking patch drivers/staging/vt6655/baseband.c... Checking patch drivers/staging/vt6655/channel.c... Checking patch drivers/staging/vt6655/device.h... Checking patch drivers/staging/vt6655/device_main.c... Applied patch drivers/staging/vt6655/baseband.c cleanly. Applied patch drivers/staging/vt6655/channel.c cleanly. Applied patch drivers/staging/vt6655/device.h cleanly. Applied patch drivers/staging/vt6655/device_main.c cleanly. kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git diff
drivers/staging/vt6655/baseband.c +1 -1
@@ -2087,7 +2087,7 @@ bool bb_vt3253_init(struct vnt_private *priv)/* {{ RobertYu: 20050104 */ }else {/* No VGA Table now */ - priv->bUpdateBBVGA = false; + priv->update_bbvga = false;^M priv->bbvga[0] = 0x1C; }
drivers/staging/vt6655/channel.c +1 -1
@@ -86,7 +86,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)return ret;/* Set VGA to max sensitivity */ -if (priv->bUpdateBBVGA && + if (priv->update_bbvga &&^M priv->bbvga_current != priv->bbvga[0 ]) { priv->bbvga_current = priv->bbvga[0 ];
drivers/staging/vt6655/device.h +1 -1
@@ -246,7 +246,7 @@ struct vnt_private {unsigned char byAutoFBCtrl;/* For Update BaseBand VGA Gain Offset */ -bool bUpdateBBVGA; + bool update_bbvga;^M unsigned int uBBVGADiffCount;unsigned char bbvga_new;unsigned char bbvga_current;
drivers/staging/vt6655/device_main.c +3 -3
@@ -179,7 +179,7 @@ device_set_options(struct vnt_private *priv) priv->byBBType = priv->opts.bbp_type; priv->byPacketType = priv->byBBType; priv->byAutoFBCtrl =AUTO_FB_0 ; - priv->bUpdateBBVGA = true; + priv->update_bbvga = true;^M priv->preamble_type = 0;pr_debug (" byShortRetryLimit= %d\n" , (int )priv->byShortRetryLimit);
@@ -423,7 +423,7 @@ static void device_init_registers(struct vnt_private *priv)/* initialize BBP registers */ bb_vt3253_init (priv); -if (priv->bUpdateBBVGA) { + if (priv->update_bbvga) {^M priv->bbvga_current = priv->bbvga[0]; priv->bbvga_new = priv->bbvga_current;bb_set_vga_gain_offset (priv, priv->bbvga[0 ]);
@@ -1040,7 +1040,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)long dbm;int i; -if (!priv->bUpdateBBVGA) + if (!priv->update_bbvga)^Mreturn ;if (priv->hw->conf.flags &IEEE80211_CONF_OFFCHANNEL )
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git add . kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git commit -m "test" WARNING: Missing commit description - Add an appropriate one
ERROR: DOS line endings
#16: FILE: drivers/staging/vt6655/baseband.c:2090:
+^I^Ipriv->update_bbvga = false;^M$
ERROR: DOS line endings
#29: FILE: drivers/staging/vt6655/channel.c:89:
+^Iif (priv->update_bbvga &&^M$
ERROR: DOS line endings
#42: FILE: drivers/staging/vt6655/device.h:249:
+^Ibool update_bbvga;^M$
ERROR: DOS line endings
#55: FILE: drivers/staging/vt6655/device_main.c:182:
+^Ipriv->update_bbvga = true;^M$
ERROR: DOS line endings
#64: FILE: drivers/staging/vt6655/device_main.c:426:
+^Iif (priv->update_bbvga) {^M$
ERROR: DOS line endings
#73: FILE: drivers/staging/vt6655/device_main.c:1043:
+^Iif (!priv->update_bbvga)^M$
ERROR: Missing Signed-off-by: line(s)
total: 7 errors, 1 warnings, 0 checks, 48 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or
--fix-inplace.
"[PATCH] test" has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[staging-testing 0e62bfff3764] test
4 files changed, 6 insertions(+), 6 deletions(-)
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Other patch:
Same issue
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git diff
drivers/staging/rtl8192e/rtl819x_BAProc.c +0 -0
@@ -43,11 +43,11 @@ static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs static u8 rx_ts_delete_ba(struct rtllib_device *ieee, struct
rx_ts_record *ts)
{
- struct ba_record *pBa = &ts->rx_admitted_ba_record;
+ struct ba_record *ba = &ts->rx_admitted_ba_record;^M
u8 bSendDELBA = false;
- if (pBa->b_valid) {
- deactivate_ba_entry(ieee, pBa);
+ if (ba->b_valid) {^M
+ deactivate_ba_entry(ieee, ba);^M
bSendDELBA = true;
}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
downloaded from https://lore.kernel.org/linux-staging/[email protected]/T/#m1d8abbe97ebcba7afc5def6b318e608be22cb0d8
On right clik on Link "raw" -> "save link as..."
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply --reject --ignore-space-change --ignore-whitespace ~/Downloads/PATCH-2-4-staging-vt6655-Rename-variable-byCurrentCh.txt Checking patch drivers/staging/vt6655/channel.c... Checking patch drivers/staging/vt6655/device.h... Applied patch drivers/staging/vt6655/channel.c cleanly. Applied patch drivers/staging/vt6655/device.h cleanly. kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git diff
drivers/staging/vt6655/channel.c +3 -3
@@ -82,7 +82,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) {bool ret = true; -if (priv->byCurrentCh == ch->hw_value) +if (priv->current_ch == ch->hw_value)return ret;/* Set VGA to max sensitivity */
@@ -100,7 +100,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)* it is for better TX throughput */ - priv->byCurrentCh = ch->hw_value; + priv->current_ch = ch->hw_value; ret &=RFbSelectChannel (priv, priv->rf_type, ch->hw_value);
@@ -117,9 +117,9 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)/* set HW default power register */ VT6655_MAC_SELECT_PAGE1 (priv->port_offset); -RFbSetPower (priv,RATE_1M , priv->byCurrentCh); +RFbSetPower (priv,RATE_1M , priv->current_ch); iowrite8(priv->byCurPwr, priv->port_offset +
MAC_REG_PWRCCK);
- RFbSetPower(priv, RATE_6M, priv->byCurrentCh);
+ RFbSetPower(priv, RATE_6M, priv->current_ch);
iowrite8(priv->byCurPwr, priv->port_offset +
MAC_REG_PWROFDM);
VT6655_MAC_SELECT_PAGE0(priv->port_offset);@@ -127,9 +127,9 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
}
if (priv->byBBType == BB_TYPE_11B)- RFbSetPower(priv, RATE_1M, priv->byCurrentCh);
+ RFbSetPower(priv, RATE_1M, priv->current_ch);
else
- RFbSetPower(priv, RATE_6M, priv->byCurrentCh);
+ RFbSetPower(priv, RATE_6M, priv->current_ch);
return ret;
}
drivers/staging/vt6655/device.h +1 -1
@@ -239,7 +239,7 @@ struct vnt_private {bool bIsBeaconBufReadySet;unsigned int cbBeaconBufReadySetCnt;bool bFixRate; -u16 byCurrentCh; +u16 current_ch;bool bAES;
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$
Sorry for the mess.
Bye Philipp