staging: vt6655: replace camel case variables
v7 cover staging: vt6655: replace camel case variables
This series replace the following camel case variables into equivalent snake case variable for vt6655 driver.
bShortSlotTime -> short_slot_time
ldBmThreshold -> dbm_threshold
PortOffset -> port_offset
Tommaso Merciai (3):
staging: vt6655: fix camelcase in bShortSlotTime
staging: vt6655: fix camelcase in ldBmThreshold
staging: vt6655: fix camelcase in PortOffset
drivers/staging/vt6655/baseband.c | 58 +++++------ drivers/staging/vt6655/card.c | 90 ++++++++-------- drivers/staging/vt6655/channel.c | 10 +- drivers/staging/vt6655/device.h | 6 +- drivers/staging/vt6655/device_main.c | 150 +++++++++++++-------------- drivers/staging/vt6655/mac.c | 46 ++++---- drivers/staging/vt6655/power.c | 24 ++--- drivers/staging/vt6655/rf.c | 12 +-- drivers/staging/vt6655/rxtx.c | 12 +-- 9 files changed, 204 insertions(+), 204 deletions(-)
Signature · 1 line
2.25.1
PATCH v7 1/3 staging: vt6655: fix camelcase in bShortSlotTime
Replace camel case variable bShortSlotTime with snake case variable short_slot_time. bShortSlotTime is a boolean variable, if true short slot time is enabled, false not. Short Slot Time reduces the slot time from 20 microseconds to 9 microseconds, where the slot time is the maximum theoretical time for a frame to travel a network.
References:
- http://cciew.blogspot.com/2011/02/short-slot-time.html
- https://www.cse.wustl.edu/~jain/cse574-16/ftp/j_05lan4.pdf
- https://www.networkdatapedia.com/post/2013/09/16/ \
configuring-short-slot-time-to-improve-wifi-performance
- https://en.wikipedia.org/wiki/Slot_time
---
Changes since v5:
- Fix variable name short_slot_time instead of b_short_slot_time
- Add more details in commit message
Changes since v4:
- Make the commit body message more clearer
Changes since v3:
- Fix patch changelog
Changes since v2:
- Add patch changelog
Changes since v1:
- Make the commit message more clearer
drivers/staging/vt6655/baseband.c | 4 ++-- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/vt6655/baseband.c +2 -2
@@ -2200,7 +2200,7 @@ bb_set_short_slot_time(struct vnt_private *priv)bb_read_embedded (priv,0x0A , &by_bb_rx_conf);/* CR10 */ -if (priv->bShortSlotTime) +if (priv->short_slot_time) by_bb_rx_conf &=0xDF ;/* 1101 1111 */ else by_bb_rx_conf |=0x20 ;/* 0010 0000 */
@@ -2223,7 +2223,7 @@ void bb_set_vga_gain_offset(struct vnt_private *priv, unsigned char by_data)/* patch for 3253B0 Baseband with Cardbus module */ if (by_data == priv->abyBBVGA[0 ]) by_bb_rx_conf |=0x20 ;/* 0010 0000 */ -else if (priv->bShortSlotTime) +else if (priv->short_slot_time) by_bb_rx_conf &=0xDF ;/* 1101 1111 */ else by_bb_rx_conf |=0x20 ;/* 0010 0000 */
drivers/staging/vt6655/card.c +1 -1
@@ -258,7 +258,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)bb_write_embedded (priv,0x88 ,0x08 ); bySIFS =C_SIFS_BG ; -if (priv->bShortSlotTime) { +if (priv->short_slot_time) { bySlot =C_SLOT_SHORT ; byDIFS =C_SIFS_BG +2 *C_SLOT_SHORT ; }else {
drivers/staging/vt6655/device.h +1 -1
@@ -215,7 +215,7 @@ struct vnt_private {bool bEncryptionEnable;bool bLongHeader; -bool bShortSlotTime; +bool short_slot_time;bool bProtectMode;bool bNonERPPresent;bool bBarkerPreambleMd;
drivers/staging/vt6655/device_main.c +2 -2
@@ -1440,9 +1440,9 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_ERP_SLOT ) {if (conf->use_short_slot) - priv->bShortSlotTime = true; + priv->short_slot_time = true;else - priv->bShortSlotTime = false; + priv->short_slot_time = false;CARDbSetPhyParameter (priv, priv->byBBType);bb_set_vga_gain_offset (priv, priv->abyBBVGA[0 ]);
Signature · 1 line
2.25.1
Re: [PATCH v7 1/3] staging: vt6655: fix camelcase in bShortSlotTime
Re: [PATCH v7 1/3] staging: vt6655: fix camelcase in bShortSlotTime
Quoted 3 lines · Dan Carpenter
Looks okay. Thanks!
Reviewed-by Dan Carpenter <[email protected]>
Thanks for review Dan!
Tommaso
Quoted 4 lines
regards,
dan carpenter
PATCH v7 2/3 staging: vt6655: fix camelcase in ldBmThreshold
In reply to Tommaso MerciaiReplace camel case variable ldBmThreshold with snake case variable dbm_threshold. ldBmThreshold is in hungarian notation, where "l" is for long and "dbm" is for decibel-milliwatt (signal strenght). This variable contain's signal strenght threshold in dbm.
References:
- https://en.wikipedia.org/wiki/Hungarian_notation
- https://www.rapidtables.com/electric/dBm.html
---
Changes since v6:
- Fix wrong commit
Changes since v5:
- Fix variable name dbm_threshold instead of ld_bm_threshold
- Add more details in commit message
Changes since v4:
- Make the commit body message more clearer
Changes since v3:
- Fix patch changelog
Changes since v2:
- Add patch changelog
Changes since v1:
- Make the commit message more clearer
drivers/staging/vt6655/baseband.c | 48 ++++++++++++++-------------- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-)
drivers/staging/vt6655/baseband.c +24 -24
@@ -2021,10 +2021,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1 ] =0x0A ; priv->abyBBVGA[2 ] =0x0 ; priv->abyBBVGA[3 ] =0x0 ; - priv->ldBmThreshold[0 ] =-70 ; - priv->ldBmThreshold[1 ] =-50 ; - priv->ldBmThreshold[2 ] =0 ; - priv->ldBmThreshold[3 ] =0 ; + priv->dbm_threshold[0 ] =-70 ; + priv->dbm_threshold[1 ] =-50 ; + priv->dbm_threshold[2 ] =0 ; + priv->dbm_threshold[3 ] =0 ; }else if ((by_rf_type ==RF_AIROHA ) || (by_rf_type ==RF_AL2230S )) {for (ii =0 ; ii <CB_VT3253B0_INIT_FOR_AIROHA2230 ; ii++) result &= bb_write_embedded(priv,
@@ -2039,10 +2039,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1 ] =0x10 ; priv->abyBBVGA[2 ] =0x0 ; priv->abyBBVGA[3 ] =0x0 ; - priv->ldBmThreshold[0 ] =-70 ; - priv->ldBmThreshold[1 ] =-48 ; - priv->ldBmThreshold[2 ] =0 ; - priv->ldBmThreshold[3 ] =0 ; + priv->dbm_threshold[0 ] =-70 ; + priv->dbm_threshold[1 ] =-48 ; + priv->dbm_threshold[2 ] =0 ; + priv->dbm_threshold[3 ] =0 ; }else if (by_rf_type ==RF_UW2451 ) {for (ii =0 ; ii <CB_VT3253B0_INIT_FOR_UW2451 ; ii++) result &= bb_write_embedded(priv,
@@ -2061,10 +2061,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1 ] =0x0A ; priv->abyBBVGA[2 ] =0x0 ; priv->abyBBVGA[3 ] =0x0 ; - priv->ldBmThreshold[0 ] =-60 ; - priv->ldBmThreshold[1 ] =-50 ; - priv->ldBmThreshold[2 ] =0 ; - priv->ldBmThreshold[3 ] =0 ; + priv->dbm_threshold[0 ] =-60 ; + priv->dbm_threshold[1 ] =-50 ; + priv->dbm_threshold[2 ] =0 ; + priv->dbm_threshold[3 ] =0 ; }else if (by_rf_type ==RF_UW2452 ) {for (ii =0 ; ii <CB_VT3253B0_INIT_FOR_UW2451 ; ii++) result &= bb_write_embedded(priv,
@@ -2107,10 +2107,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1 ] =0x0A ; priv->abyBBVGA[2 ] =0x0 ; priv->abyBBVGA[3 ] =0x0 ; - priv->ldBmThreshold[0 ] =-60 ; - priv->ldBmThreshold[1 ] =-50 ; - priv->ldBmThreshold[2 ] =0 ; - priv->ldBmThreshold[3 ] =0 ; + priv->dbm_threshold[0 ] =-60 ; + priv->dbm_threshold[1 ] =-50 ; + priv->dbm_threshold[2 ] =0 ; + priv->dbm_threshold[3 ] =0 ;/* }} RobertYu */ }else if (by_rf_type ==RF_VT3226 ) {
@@ -2127,10 +2127,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1 ] =0x10 ; priv->abyBBVGA[2 ] =0x0 ; priv->abyBBVGA[3 ] =0x0 ; - priv->ldBmThreshold[0 ] =-70 ; - priv->ldBmThreshold[1 ] =-48 ; - priv->ldBmThreshold[2 ] =0 ; - priv->ldBmThreshold[3 ] =0 ; + priv->dbm_threshold[0 ] =-70 ; + priv->dbm_threshold[1 ] =-48 ; + priv->dbm_threshold[2 ] =0 ; + priv->dbm_threshold[3 ] =0 ;/* Fix VT3226 DFC system timing issue */ MACvSetRFLE_LatchBase (iobase);/* {{ RobertYu: 20050104 */
@@ -2161,10 +2161,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1 ] =0x10 ; priv->abyBBVGA[2 ] =0x0 ; priv->abyBBVGA[3 ] =0x0 ; - priv->ldBmThreshold[0 ] =-70 ; - priv->ldBmThreshold[1 ] =-48 ; - priv->ldBmThreshold[2 ] =0 ; - priv->ldBmThreshold[3 ] =0 ; + priv->dbm_threshold[0 ] =-70 ; + priv->dbm_threshold[1 ] =-48 ; + priv->dbm_threshold[2 ] =0 ; + priv->dbm_threshold[3 ] =0 ;/* }} RobertYu */ }else {/* No VGA Table now */
drivers/staging/vt6655/device.h +1 -1
@@ -253,7 +253,7 @@ struct vnt_private {unsigned char byBBVGANew;unsigned char byBBVGACurrent;unsigned char abyBBVGA[BB_VGA_LEVEL ]; -long ldBmThreshold[BB_VGA_LEVEL ]; +long dbm_threshold[BB_VGA_LEVEL ];unsigned char byBBPreEDRSSI;unsigned char byBBPreEDIndex;
drivers/staging/vt6655/device_main.c +1 -1
@@ -986,7 +986,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv)RFvRSSITodBm (priv, (u8 )priv->uCurrRSSI, &dbm);for (i =0 ; i <BB_VGA_LEVEL ; i++) { -if (dbm < priv->ldBmThreshold[i]) { +if (dbm < priv->dbm_threshold[i]) { priv->byBBVGANew = priv->abyBBVGA[i];break ; }
Signature · 1 line
2.25.1
PATCH v7 3/3 staging: vt6655: fix camelcase in PortOffset
In reply to Tommaso MerciaiReplace camel case variable PortOffset with snake case variable port_offset.
---
Changes since v4:
- Make the commit body message more clearer
Changes since v3:
- Fix patch changelog
Changes since v2:
- Add patch changelog
Changes since v1:
- Fix: port_offset istead of port_off_set
- Make the commit message more clearer
drivers/staging/vt6655/baseband.c | 6 +- drivers/staging/vt6655/card.c | 88 ++++++++-------- drivers/staging/vt6655/channel.c | 10 +- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 144 +++++++++++++-------------- drivers/staging/vt6655/mac.c | 46 ++++----- drivers/staging/vt6655/power.c | 24 ++--- drivers/staging/vt6655/rf.c | 12 +-- drivers/staging/vt6655/rxtx.c | 12 +-- 9 files changed, 172 insertions(+), 172 deletions(-)
drivers/staging/vt6655/baseband.c +3 -3
@@ -1905,7 +1905,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,bool bb_read_embedded (struct vnt_private *priv,unsigned char by_bb_addr,unsigned char *pby_data) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;unsigned short ww;unsigned char by_value;
@@ -1948,7 +1948,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr,bool bb_write_embedded (struct vnt_private *priv,unsigned char by_bb_addr,unsigned char by_data) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;unsigned short ww;unsigned char by_value;
@@ -1992,7 +1992,7 @@ bool bb_vt3253_init(struct vnt_private *priv) {bool result = true;int ii; -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;unsigned char by_rf_type = priv->byRFType;unsigned char by_local_id = priv->byLocalID;
drivers/staging/vt6655/card.c +44 -44
294 lines not on this page · raw message
drivers/staging/vt6655/channel.c +5 -5
@@ -173,7 +173,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) }/* clear NAV */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_MACCR ,MACCR_CLRNAV ); +MACvRegBitsOn (priv->port_offset,MAC_REG_MACCR ,MACCR_CLRNAV );/* TX_PE will reserve 3 us for MAX2829 A mode only, * it is for better TX throughput
@@ -199,14 +199,14 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)spin_lock_irqsave (&priv->lock, flags);/* set HW default power register */ -MACvSelectPage1 (priv->PortOffset); +MACvSelectPage1 (priv->port_offset);RFbSetPower (priv,RATE_1M , priv->byCurrentCh); -VNSvOutPortB (priv->PortOffset +MAC_REG_PWRCCK , +VNSvOutPortB (priv->port_offset +MAC_REG_PWRCCK , priv->byCurPwr);RFbSetPower (priv,RATE_6M , priv->byCurrentCh); -VNSvOutPortB (priv->PortOffset +MAC_REG_PWROFDM , +VNSvOutPortB (priv->port_offset +MAC_REG_PWROFDM , priv->byCurPwr); -MACvSelectPage0 (priv->PortOffset); +MACvSelectPage0 (priv->port_offset);spin_unlock_irqrestore (&priv->lock, flags); }
drivers/staging/vt6655/device.h +1 -1
@@ -124,7 +124,7 @@ struct vnt_private {unsigned char *tx1_bufs;unsigned char *tx_beacon_bufs; -void __iomem *PortOffset; +void __iomem *port_offset;u32 memaddr;u32 ioaddr;
drivers/staging/vt6655/device_main.c +72 -72
399 lines not on this page · raw message
drivers/staging/vt6655/mac.c +23 -23
184 lines not on this page · raw message
drivers/staging/vt6655/power.c +12 -12
@@ -52,30 +52,30 @@ void PSvEnablePowerSaving(struct vnt_private *priv,u16 wAID = priv->current_aid |BIT (14 ) |BIT (15 );/* set period of power up before TBTT */ -VNSvOutPortW (priv->PortOffset +MAC_REG_PWBT ,C_PWBT ); +VNSvOutPortW (priv->port_offset +MAC_REG_PWBT ,C_PWBT );if (priv->op_mode !=NL80211_IFTYPE_ADHOC ) {/* set AID */ -VNSvOutPortW (priv->PortOffset +MAC_REG_AIDATIM , wAID); +VNSvOutPortW (priv->port_offset +MAC_REG_AIDATIM , wAID); }/* Set AutoSleep */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP ); +MACvRegBitsOn (priv->port_offset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP );/* Set HWUTSF */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF ); +MACvRegBitsOn (priv->port_offset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF );if (wListenInterval >=2 ) {/* clear always listen beacon */ -MACvRegBitsOff (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); +MACvRegBitsOff (priv->port_offset,MAC_REG_PSCTL ,PSCTL_ALBCN );/* first time set listen next beacon */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_LNBCN ); +MACvRegBitsOn (priv->port_offset,MAC_REG_PSCTL ,PSCTL_LNBCN ); }else {/* always listen beacon */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); +MACvRegBitsOn (priv->port_offset,MAC_REG_PSCTL ,PSCTL_ALBCN ); }/* enable power saving hw function */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_PSEN ); +MACvRegBitsOn (priv->port_offset,MAC_REG_PSCTL ,PSCTL_PSEN ); priv->bEnablePSMode = true; priv->bPWBitOn = true;
@@ -98,13 +98,13 @@ void PSvDisablePowerSaving(struct vnt_private *priv)MACbPSWakeup (priv);/* clear AutoSleep */ -MACvRegBitsOff (priv->PortOffset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP ); +MACvRegBitsOff (priv->port_offset,MAC_REG_PSCFG ,PSCFG_AUTOSLEEP );/* clear HWUTSF */ -MACvRegBitsOff (priv->PortOffset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF ); +MACvRegBitsOff (priv->port_offset,MAC_REG_TFTCTL ,TFTCTL_HWUTSF );/* set always listen beacon */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_PSCTL ,PSCTL_ALBCN ); +MACvRegBitsOn (priv->port_offset,MAC_REG_PSCTL ,PSCTL_ALBCN ); priv->bEnablePSMode = false;
@@ -135,7 +135,7 @@ bool PSbIsNextTBTTWakeUp(struct vnt_private *priv)if (priv->wake_up_count ==1 ) {/* Turn on wake up to listen next beacon */ -MACvRegBitsOn (priv->PortOffset, +MACvRegBitsOn (priv->port_offset,MAC_REG_PSCTL ,PSCTL_LNBCN ); wake_up = true; }
drivers/staging/vt6655/rf.c +6 -6
@@ -406,7 +406,7 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {*/ static bool s_bAL7230Init (struct vnt_private *priv) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;int ii;bool ret;
@@ -455,7 +455,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)*/ static bool s_bAL7230SelectChannel (struct vnt_private *priv,unsigned char byChannel) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;bool ret; ret = true;
@@ -494,7 +494,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha*/ bool IFRFbWriteEmbedded (struct vnt_private *priv,unsigned long dwData) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;unsigned short ww;unsigned long dwValue;
@@ -527,7 +527,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)*/ static bool RFbAL2230Init (struct vnt_private *priv) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;int ii;bool ret;
@@ -572,7 +572,7 @@ static bool RFbAL2230Init(struct vnt_private *priv)static bool RFbAL2230SelectChannel (struct vnt_private *priv,unsigned char byChannel) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;bool ret; ret = true;
@@ -679,7 +679,7 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,bool RFvWriteWakeProgSyn (struct vnt_private *priv,unsigned char byRFType,u16 uChannel) { -void __iomem *iobase = priv->PortOffset; +void __iomem *iobase = priv->port_offset;int ii;unsigned char byInitCount =0 ;unsigned char bySleepCount =0 ;
drivers/staging/vt6655/rxtx.c +6 -6
@@ -1422,13 +1422,13 @@ static int vnt_beacon_xmit(struct vnt_private *priv, priv->wBCNBufLen =sizeof (*short_head) + skb->len; -MACvSetCurrBCNTxDescAddr (priv->PortOffset, priv->tx_beacon_dma); +MACvSetCurrBCNTxDescAddr (priv->port_offset, priv->tx_beacon_dma); -MACvSetCurrBCNLength (priv->PortOffset, priv->wBCNBufLen); +MACvSetCurrBCNLength (priv->port_offset, priv->wBCNBufLen);/* Set auto Transmit on */ -MACvRegBitsOn (priv->PortOffset,MAC_REG_TCR ,TCR_AUTOBCNTX ); +MACvRegBitsOn (priv->port_offset,MAC_REG_TCR ,TCR_AUTOBCNTX );/* Poll Transmit the adapter */ -MACvTransmitBCN (priv->PortOffset); +MACvTransmitBCN (priv->port_offset);return 0 ; }
@@ -1452,9 +1452,9 @@ int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif)int vnt_beacon_enable (struct vnt_private *priv,struct ieee80211_vif *vif,struct ieee80211_bss_conf *conf) { -VNSvOutPortB (priv->PortOffset +MAC_REG_TFTCTL ,TFTCTL_TSFCNTRST ); +VNSvOutPortB (priv->port_offset +MAC_REG_TFTCTL ,TFTCTL_TSFCNTRST ); -VNSvOutPortB (priv->PortOffset +MAC_REG_TFTCTL ,TFTCTL_TSFCNTREN ); +VNSvOutPortB (priv->port_offset +MAC_REG_TFTCTL ,TFTCTL_TSFCNTREN );CARDvSetFirstNextTBTT (priv, conf->beacon_int);
Signature · 1 line
2.25.1