Re: [PATCH] staging: rtl8188eu: replace camelcase field CustomerID
On Mon, Jan 03, 2022 at 12:11:32PM +0100, Alberto Merciai wrote: > Replace camelcase field CustomerID to customer_id, compliant > with linux kernel coding style. Apologize, don't consider it, wrong branch was used. Regards, Alberto Merciai ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8188eu: replace camelcase field CustomerID
Replace camelcase field CustomerID to customer_id, compliant
with linux kernel coding style.
Signed-off-by: Alberto Merciai
---
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +-
drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 +-
drivers/staging/rtl8188eu/include/rtw_eeprom.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index 1af919ff6d93..81d79b39e048 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -43,7 +43,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
dm_odm->SupportICType = ODM_RTL8188E;
dm_odm->CutVersion = ODM_CUT_A;
dm_odm->bIsMPChip = hal_data->VersionID.ChipType == NORMAL_CHIP;
- dm_odm->PatchID = hal_data->CustomerID;
+ dm_odm->PatchID = hal_data->customer_id;
dm_odm->bWIFITest = Adapter->registrypriv.wifi_spec;
dm_odm->AntDivType = hal_data->TRxAntDivType;
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c
b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 16a57b31a439..0fa01549bfa7 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1385,7 +1385,7 @@ void rtw_hal_set_hwreg(struct adapter *Adapter, u8
variable, u8 *val)
usb_write32(Adapter, REG_RCR,
usb_read32(Adapter, REG_RCR) | RCR_CBSSID_DATA | RCR_CBSSID_BCN);
if (check_fwstate(pmlmepriv,
WIFI_STATION_STATE))
- RetryLimit = (haldata->CustomerID ==
RT_CID_CCX) ? 7 : 48;
+ RetryLimit = (haldata->customer_id ==
RT_CID_CCX) ? 7 : 48;
else /* Ad-hoc Mode */
RetryLimit = 0x7;
} else if (type == 1) {
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index eb4655ecf6e0..231800f60583 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -181,7 +181,7 @@ struct txpowerinfo24g {
struct hal_data_8188e {
struct HAL_VERSION VersionID;
- u16 CustomerID;
+ u16 customer_id;
u16 FirmwareVersion;
u16 FirmwareVersionRev;
u16 FirmwareSubVersion;
diff --git a/drivers/staging/rtl8188eu/include/rtw_eeprom.h
b/drivers/staging/rtl8188eu/include/rtw_eeprom.h
index 10525493129b..57b675baf5bc 100644
--- a/drivers/staging/rtl8188eu/include/rtw_eeprom.h
+++ b/drivers/staging/rtl8188eu/include/rtw_eeprom.h
@@ -49,7 +49,7 @@
/* EEPROM size consideration. So, we have to perform proper translation
* between them.
*/
-/* Besides, CustomerID of registry has precedence of that of EEPROM. */
+/* Besides, customer_id of registry has precedence of that of EEPROM. */
/* defined below. 060703, by rcnjko. */
enum RT_CUSTOMER_ID {
RT_CID_DEFAULT = 0,
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3] staging: vt6655: refactor camelcase uCurrRSSI to current_rssi
driver-core$ ./scripts/get_maintainer.pl drivers/staging/vt6655/device.h Forest Bond (odd fixer:STAGING - VIA VT665X DRIVERS) Greg Kroah-Hartman (supporter:STAGING SUBSYSTEM) Alberto Merciai (commit_signer:2/2=100%,authored:2/2=100%,added_lines:2/2=100%,removed_lines:2/2=100%) de...@driverdev.osuosl.org (open list:STAGING SUBSYSTEM) linux-ker...@vger.kernel.org (open list) Regards, Alberto On Fri, Nov 19, 2021 at 07:38:32AM +0100, Greg KH wrote: > On Thu, Nov 18, 2021 at 09:27:18PM +0100, Alberto Merciai wrote: > > Replace camelcase variable "uCurrRSSI" (current Received Signal Strength > > Indicator) into linux kernel coding style equivalent > > variable "current_rssi". > > > > Signed-off-by: Alberto Merciai > > --- > > > > v2 > > - correct mailing list > > No, you did not use the correct mailing list. > > What is the output of scripts/get_maintainer.pl on your patch? > > thanks, > > greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3] staging: vt6655: refactor camelcase uCurrRSSI to current_rssi
I'm using the master branch of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/ Alberto On Fri, Nov 19, 2021 at 11:51:38AM +0300, Dan Carpenter wrote: > On Thu, Nov 18, 2021 at 09:27:18PM +0100, Alberto Merciai wrote: > > Replace camelcase variable "uCurrRSSI" (current Received Signal Strength > > Indicator) into linux kernel coding style equivalent > > variable "current_rssi". > > > > Signed-off-by: Alberto Merciai > > --- > > > > v2 > > - correct mailing list > > Are you using the staging-next tree? > > regards, > dan carpenter > ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: vt6655: refactor camelcase byMaxPwrLevel to max_pwr_level
Replace hungarian notated variable "byMaxPwrLevel" with "max_pwr_level"
compliant with linux kernel coding style.
Signed-off-by: Alberto Merciai
---
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/rf.c | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index f5dee7ad99cd..d2be83b611ae 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -159,7 +159,7 @@ struct vnt_private {
unsigned char byLocalID;
unsigned char byRFType;
- unsigned char byMaxPwrLevel;
+ unsigned char max_pwr_level;
unsigned char byZoneType;
bool bZoneRegExist;
unsigned char byOriginalZonetype;
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index 747d79265a7c..e8a9444c6833 100644
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -611,11 +611,11 @@ bool RFbInit(struct vnt_private *priv)
switch (priv->byRFType) {
case RF_AIROHA:
case RF_AL2230S:
- priv->byMaxPwrLevel = AL2230_PWR_IDX_LEN;
+ priv->max_pwr_level = AL2230_PWR_IDX_LEN;
ret = RFbAL2230Init(priv);
break;
case RF_AIROHA7230:
- priv->byMaxPwrLevel = AL7230_PWR_IDX_LEN;
+ priv->max_pwr_level = AL7230_PWR_IDX_LEN;
ret = s_bAL7230Init(priv);
break;
case RF_NOTHING:
@@ -788,8 +788,8 @@ bool RFbSetPower(struct vnt_private *priv, unsigned int
rate, u16 uCH)
else
byDec = byPwr + 10;
- if (byDec >= priv->byMaxPwrLevel)
- byDec = priv->byMaxPwrLevel - 1;
+ if (byDec >= priv->max_pwr_level)
+ byDec = priv->max_pwr_level - 1;
byPwr = byDec;
break;
@@ -831,7 +831,7 @@ bool RFbRawSetPower(struct vnt_private *priv, unsigned char
byPwr,
bool ret = true;
unsigned long dwMax7230Pwr = 0;
- if (byPwr >= priv->byMaxPwrLevel)
+ if (byPwr >= priv->max_pwr_level)
return false;
switch (priv->byRFType) {
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v4] staging: vt6655: refactor camelcase uCurrRSSI to current_rssi
Replace camelcase variable "uCurrRSSI" (current Received Signal Strength
Indicator) into linux kernel coding style equivalent
variable "current_rssi".
Signed-off-by: Alberto Merciai
---
v3
- change tab with whitespace next to current_rssi
v2
- correct mailing list
v1
- remove whitespaces
drivers/staging/vt6654/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 4 ++--
drivers/staging/vt6655/dpc.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..dffd9b2db575 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -167,7 +167,7 @@ struct vnt_private {
unsigned char abyCurrentNetAddr[ETH_ALEN]; __aligned(2)
bool bLinkPass; /* link status: OK or fail */
- unsigned intuCurrRSSI;
+ unsigned int current_rssi;
unsigned char byCurrSQ;
unsigned long dwTxAntennaSel;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..17cdb2dc0aa9 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -979,10 +979,10 @@ static void vnt_check_bb_vga(struct vnt_private *priv)
if (priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
return;
- if (!(priv->vif->bss_conf.assoc && priv->uCurrRSSI))
+ if (!(priv->vif->bss_conf.assoc && priv->current_rssi))
return;
- RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, );
+ RFvRSSITodBm(priv, (u8)priv->current_rssi, );
for (i = 0; i < BB_VGA_LEVEL; i++) {
if (dbm < priv->ldBmThreshold[i]) {
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 52214a30e9b6..9fea1ee0d612 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -82,7 +82,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct
sk_buff *skb,
RFvRSSITodBm(priv, *rssi, _dbm);
priv->byBBPreEDRSSI = (u8)rx_dbm + 1;
- priv->uCurrRSSI = *rssi;
+ priv->current_rssi = *rssi;
skb_pull(skb, 4);
skb_trim(skb, frame_size);
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3] staging: vt6655: refactor camelcase uCurrRSSI to current_rssi
Replace camelcase variable "uCurrRSSI" (current Received Signal Strength
Indicator) into linux kernel coding style equivalent
variable "current_rssi".
Signed-off-by: Alberto Merciai
---
v2
- correct mailing list
v1
- remove whitespaces
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 4 ++--
drivers/staging/vt6655/dpc.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..80c9ace0d116 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -167,7 +167,7 @@ struct vnt_private {
unsigned char abyCurrentNetAddr[ETH_ALEN]; __aligned(2)
bool bLinkPass; /* link status: OK or fail */
- unsigned intuCurrRSSI;
+ unsigned intcurrent_rssi;
unsigned char byCurrSQ;
unsigned long dwTxAntennaSel;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..17cdb2dc0aa9 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -979,10 +979,10 @@ static void vnt_check_bb_vga(struct vnt_private *priv)
if (priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
return;
- if (!(priv->vif->bss_conf.assoc && priv->uCurrRSSI))
+ if (!(priv->vif->bss_conf.assoc && priv->current_rssi))
return;
- RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, );
+ RFvRSSITodBm(priv, (u8)priv->current_rssi, );
for (i = 0; i < BB_VGA_LEVEL; i++) {
if (dbm < priv->ldBmThreshold[i]) {
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 52214a30e9b6..9fea1ee0d612 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -82,7 +82,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct
sk_buff *skb,
RFvRSSITodBm(priv, *rssi, _dbm);
priv->byBBPreEDRSSI = (u8)rx_dbm + 1;
- priv->uCurrRSSI = *rssi;
+ priv->current_rssi = *rssi;
skb_pull(skb, 4);
skb_trim(skb, frame_size);
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: vt6655: refactor camelcase uCurrRSSI to current_rssi
Replace camelcase variable "uCurrRSSI" (current Received Signal Strength
Indicator) into linux kernel coding style equivalent
variable "current_rssi".
Signed-off-by: Alberto Merciai
---
v1
- remove whitespaces
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 4 ++--
drivers/staging/vt6655/dpc.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..dffd9b2db575 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -167,7 +167,7 @@ struct vnt_private {
unsigned char abyCurrentNetAddr[ETH_ALEN]; __aligned(2)
bool bLinkPass; /* link status: OK or fail */
- unsigned intuCurrRSSI;
+ unsigned int current_rssi;
unsigned char byCurrSQ;
unsigned long dwTxAntennaSel;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..17cdb2dc0aa9 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -979,10 +979,10 @@ static void vnt_check_bb_vga(struct vnt_private *priv)
if (priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
return;
- if (!(priv->vif->bss_conf.assoc && priv->uCurrRSSI))
+ if (!(priv->vif->bss_conf.assoc && priv->current_rssi))
return;
- RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, );
+ RFvRSSITodBm(priv, (u8)priv->current_rssi, );
for (i = 0; i < BB_VGA_LEVEL; i++) {
if (dbm < priv->ldBmThreshold[i]) {
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 52214a30e9b6..9fea1ee0d612 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -82,7 +82,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct
sk_buff *skb,
RFvRSSITodBm(priv, *rssi, _dbm);
priv->byBBPreEDRSSI = (u8)rx_dbm + 1;
- priv->uCurrRSSI = *rssi;
+ priv->current_rssi = *rssi;
skb_pull(skb, 4);
skb_trim(skb, frame_size);
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v4] staging: vt6655: fix camelcase in wCurrentRate
Replace camelcase word variable "wCurrentRate" into linux kernel coding
style equivalent "current_rate".
Signed-off-by: Alberto Merciai
---
v3:
- Remove useless links inside message body
v2:
- Add version changelog as suggested by Greg KH
v1:
- Add mail message body as suggested by Greg KH
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 12 +--
drivers/staging/vt6655/rxtx.c| 134 +--
3 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..f5dee7ad99cd 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -208,7 +208,7 @@ struct vnt_private {
unsigned char byPreambleType;
unsigned char byShortPreamble;
- unsigned short wCurrentRate;
+ unsigned short current_rate;
unsigned char byShortRetryLimit;
unsigned char byLongRetryLimit;
enum nl80211_iftype op_mode;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..2c5398b128df 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -213,7 +213,7 @@ static void device_init_registers(struct vnt_private *priv)
priv->bNonERPPresent = false;
priv->bBarkerPreambleMd = false;
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
priv->byTopOFDMBasicRate = RATE_24M;
priv->byTopCCKBasicRate = RATE_1M;
@@ -369,7 +369,7 @@ static void device_init_registers(struct vnt_private *priv)
/* Set BB and packet type at the same time. */
/* Set Short Slot Time, xIFS, and RSPINF. */
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
priv->bRadioOff = false;
@@ -1382,11 +1382,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32
changed)
if (changed & IEEE80211_CONF_CHANGE_POWER) {
if (priv->byBBType == BB_TYPE_11B)
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
else
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
}
@@ -1448,7 +1448,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
}
if (changed & BSS_CHANGED_TXPOWER)
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
if (changed & BSS_CHANGED_BEACON_ENABLED) {
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index cfab64d2b312..17795ebcdfbc 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -97,7 +97,7 @@ s_vFillRTSHead(
bool bNeedAck,
bool bDisCRC,
struct ieee80211_hdr *hdr,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
unsigned char byFBOption
);
@@ -114,7 +114,7 @@ s_vGenerateTxParameter(
bool bNeedACK,
unsigned intuDMAIdx,
void *psEthHeader,
- unsigned short wCurrentRate
+ unsigned short current_rate
);
static unsigned int
@@ -136,7 +136,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
);
@@ -197,7 +197,7 @@ s_uGetRTSCTSRsvTime(
unsigned char byRTSRsvType,
unsigned char byPktType,
unsigned int cbFrameLength,
- unsigned short wCurrentRate
+ unsigned short current_rate
)
{
unsigned int uRrvTime = 0;
@@ -206,7 +206,7 @@ s_uGetRTSCTSRsvTime(
unsigned int uAckTime = 0;
unsigned int uDataTime = 0;
- uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, wCurrentRate);
+ uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, current_rate);
if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */
uRTSTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 20, pDevice->byTopCCKBasicRate);
uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, pDevice->byTopCCKBasicRate);
@@ -440,7 +440,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
)
{
@@ -451,7 +451,7 @@ s_uF
[PATCH] staging: vt6655: refactor camelcase uCurrRSSI to current_rssi
Replace camelcase variable "uCurrRSSI" (current Received Signal Strength
Indicator) into linux kernel coding style equivalent
variable "current_rssi".
References:
https://www.kernel.org/doc/html/latest/process/coding-style.html
https://www.cse.iitk.ac.in/users/dsrkg/cs245/html/Guide.htm
---
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 4 ++--
drivers/staging/vt6655/dpc.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..80c9ace0d116 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -167,7 +167,7 @@ struct vnt_private {
unsigned char abyCurrentNetAddr[ETH_ALEN]; __aligned(2)
bool bLinkPass; /* link status: OK or fail */
- unsigned intuCurrRSSI;
+ unsigned intcurrent_rssi;
unsigned char byCurrSQ;
unsigned long dwTxAntennaSel;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..17cdb2dc0aa9 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -979,10 +979,10 @@ static void vnt_check_bb_vga(struct vnt_private *priv)
if (priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
return;
- if (!(priv->vif->bss_conf.assoc && priv->uCurrRSSI))
+ if (!(priv->vif->bss_conf.assoc && priv->current_rssi))
return;
- RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, );
+ RFvRSSITodBm(priv, (u8)priv->current_rssi, );
for (i = 0; i < BB_VGA_LEVEL; i++) {
if (dbm < priv->ldBmThreshold[i]) {
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 52214a30e9b6..9fea1ee0d612 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -82,7 +82,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct
sk_buff *skb,
RFvRSSITodBm(priv, *rssi, _dbm);
priv->byBBPreEDRSSI = (u8)rx_dbm + 1;
- priv->uCurrRSSI = *rssi;
+ priv->current_rssi = *rssi;
skb_pull(skb, 4);
skb_trim(skb, frame_size);
--
2.25.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3] staging: vt6655: fix camelcase in wCurrentRate
Replace camelcase word variable "wCurrentRate" into linux kernel coding
style equivalent "current_rate".
References:
https://www.kernel.org/doc/html/latest/process/coding-style.html
https://www.cse.iitk.ac.in/users/dsrkg/cs245/html/Guide.htm
Signed-off-by: Alberto Merciai
---
v2: Add version changelog as suggested by Greg KH
v1: Add mail message body as suggested by Greg KH
---
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 12 +--
drivers/staging/vt6655/rxtx.c| 134 +--
3 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..f5dee7ad99cd 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -208,7 +208,7 @@ struct vnt_private {
unsigned char byPreambleType;
unsigned char byShortPreamble;
- unsigned short wCurrentRate;
+ unsigned short current_rate;
unsigned char byShortRetryLimit;
unsigned char byLongRetryLimit;
enum nl80211_iftype op_mode;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..2c5398b128df 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -213,7 +213,7 @@ static void device_init_registers(struct vnt_private *priv)
priv->bNonERPPresent = false;
priv->bBarkerPreambleMd = false;
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
priv->byTopOFDMBasicRate = RATE_24M;
priv->byTopCCKBasicRate = RATE_1M;
@@ -369,7 +369,7 @@ static void device_init_registers(struct vnt_private *priv)
/* Set BB and packet type at the same time. */
/* Set Short Slot Time, xIFS, and RSPINF. */
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
priv->bRadioOff = false;
@@ -1382,11 +1382,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32
changed)
if (changed & IEEE80211_CONF_CHANGE_POWER) {
if (priv->byBBType == BB_TYPE_11B)
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
else
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
}
@@ -1448,7 +1448,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
}
if (changed & BSS_CHANGED_TXPOWER)
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
if (changed & BSS_CHANGED_BEACON_ENABLED) {
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index cfab64d2b312..17795ebcdfbc 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -97,7 +97,7 @@ s_vFillRTSHead(
bool bNeedAck,
bool bDisCRC,
struct ieee80211_hdr *hdr,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
unsigned char byFBOption
);
@@ -114,7 +114,7 @@ s_vGenerateTxParameter(
bool bNeedACK,
unsigned intuDMAIdx,
void *psEthHeader,
- unsigned short wCurrentRate
+ unsigned short current_rate
);
static unsigned int
@@ -136,7 +136,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
);
@@ -197,7 +197,7 @@ s_uGetRTSCTSRsvTime(
unsigned char byRTSRsvType,
unsigned char byPktType,
unsigned int cbFrameLength,
- unsigned short wCurrentRate
+ unsigned short current_rate
)
{
unsigned int uRrvTime = 0;
@@ -206,7 +206,7 @@ s_uGetRTSCTSRsvTime(
unsigned int uAckTime = 0;
unsigned int uDataTime = 0;
- uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, wCurrentRate);
+ uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, current_rate);
if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */
uRTSTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 20, pDevice->byTopCCKBasicRate);
uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, pDevice->byTopCCKBasicRate);
@@ -440,7 +440,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short
[PATCH v2] staging: vt6655: fix camelcase in wCurrentRate
Replace camelcase word variable "wCurrentRate" into linux kernel coding
style equivalent "current_rate".
References:
https://www.kernel.org/doc/html/latest/process/coding-style.html
https://www.cse.iitk.ac.in/users/dsrkg/cs245/html/Guide.htm
Signed-off-by: Alberto Merciai
---
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 12 +--
drivers/staging/vt6655/rxtx.c| 134 +--
3 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..f5dee7ad99cd 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -208,7 +208,7 @@ struct vnt_private {
unsigned char byPreambleType;
unsigned char byShortPreamble;
- unsigned short wCurrentRate;
+ unsigned short current_rate;
unsigned char byShortRetryLimit;
unsigned char byLongRetryLimit;
enum nl80211_iftype op_mode;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..2c5398b128df 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -213,7 +213,7 @@ static void device_init_registers(struct vnt_private *priv)
priv->bNonERPPresent = false;
priv->bBarkerPreambleMd = false;
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
priv->byTopOFDMBasicRate = RATE_24M;
priv->byTopCCKBasicRate = RATE_1M;
@@ -369,7 +369,7 @@ static void device_init_registers(struct vnt_private *priv)
/* Set BB and packet type at the same time. */
/* Set Short Slot Time, xIFS, and RSPINF. */
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
priv->bRadioOff = false;
@@ -1382,11 +1382,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32
changed)
if (changed & IEEE80211_CONF_CHANGE_POWER) {
if (priv->byBBType == BB_TYPE_11B)
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
else
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
}
@@ -1448,7 +1448,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
}
if (changed & BSS_CHANGED_TXPOWER)
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
if (changed & BSS_CHANGED_BEACON_ENABLED) {
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index cfab64d2b312..17795ebcdfbc 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -97,7 +97,7 @@ s_vFillRTSHead(
bool bNeedAck,
bool bDisCRC,
struct ieee80211_hdr *hdr,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
unsigned char byFBOption
);
@@ -114,7 +114,7 @@ s_vGenerateTxParameter(
bool bNeedACK,
unsigned intuDMAIdx,
void *psEthHeader,
- unsigned short wCurrentRate
+ unsigned short current_rate
);
static unsigned int
@@ -136,7 +136,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
);
@@ -197,7 +197,7 @@ s_uGetRTSCTSRsvTime(
unsigned char byRTSRsvType,
unsigned char byPktType,
unsigned int cbFrameLength,
- unsigned short wCurrentRate
+ unsigned short current_rate
)
{
unsigned int uRrvTime = 0;
@@ -206,7 +206,7 @@ s_uGetRTSCTSRsvTime(
unsigned int uAckTime = 0;
unsigned int uDataTime = 0;
- uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, wCurrentRate);
+ uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, current_rate);
if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */
uRTSTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 20, pDevice->byTopCCKBasicRate);
uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, pDevice->byTopCCKBasicRate);
@@ -440,7 +440,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
)
{
@@ -451,7 +451,7 @@ s_uFillDataHead(
[PATCH] staging: vt6655: fix camelcase in wCurrentRate
Signed-off-by: Alberto Merciai
---
drivers/staging/vt6655/device.h | 2 +-
drivers/staging/vt6655/device_main.c | 12 +--
drivers/staging/vt6655/rxtx.c| 134 +--
3 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 29f354ced563..f5dee7ad99cd 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -208,7 +208,7 @@ struct vnt_private {
unsigned char byPreambleType;
unsigned char byShortPreamble;
- unsigned short wCurrentRate;
+ unsigned short current_rate;
unsigned char byShortRetryLimit;
unsigned char byLongRetryLimit;
enum nl80211_iftype op_mode;
diff --git a/drivers/staging/vt6655/device_main.c
b/drivers/staging/vt6655/device_main.c
index 41cbec4134b0..2c5398b128df 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -213,7 +213,7 @@ static void device_init_registers(struct vnt_private *priv)
priv->bNonERPPresent = false;
priv->bBarkerPreambleMd = false;
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
priv->byTopOFDMBasicRate = RATE_24M;
priv->byTopCCKBasicRate = RATE_1M;
@@ -369,7 +369,7 @@ static void device_init_registers(struct vnt_private *priv)
/* Set BB and packet type at the same time. */
/* Set Short Slot Time, xIFS, and RSPINF. */
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
priv->bRadioOff = false;
@@ -1382,11 +1382,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32
changed)
if (changed & IEEE80211_CONF_CHANGE_POWER) {
if (priv->byBBType == BB_TYPE_11B)
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
else
- priv->wCurrentRate = RATE_54M;
+ priv->current_rate = RATE_54M;
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
}
@@ -1448,7 +1448,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
}
if (changed & BSS_CHANGED_TXPOWER)
- RFbSetPower(priv, priv->wCurrentRate,
+ RFbSetPower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
if (changed & BSS_CHANGED_BEACON_ENABLED) {
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index cfab64d2b312..17795ebcdfbc 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -97,7 +97,7 @@ s_vFillRTSHead(
bool bNeedAck,
bool bDisCRC,
struct ieee80211_hdr *hdr,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
unsigned char byFBOption
);
@@ -114,7 +114,7 @@ s_vGenerateTxParameter(
bool bNeedACK,
unsigned intuDMAIdx,
void *psEthHeader,
- unsigned short wCurrentRate
+ unsigned short current_rate
);
static unsigned int
@@ -136,7 +136,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
);
@@ -197,7 +197,7 @@ s_uGetRTSCTSRsvTime(
unsigned char byRTSRsvType,
unsigned char byPktType,
unsigned int cbFrameLength,
- unsigned short wCurrentRate
+ unsigned short current_rate
)
{
unsigned int uRrvTime = 0;
@@ -206,7 +206,7 @@ s_uGetRTSCTSRsvTime(
unsigned int uAckTime = 0;
unsigned int uDataTime = 0;
- uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, wCurrentRate);
+ uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType,
cbFrameLength, current_rate);
if (byRTSRsvType == 0) { /* RTSTxRrvTime_bb */
uRTSTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 20, pDevice->byTopCCKBasicRate);
uAckTime = bb_get_frame_time(pDevice->byPreambleType,
byPktType, 14, pDevice->byTopCCKBasicRate);
@@ -440,7 +440,7 @@ s_uFillDataHead(
unsigned int cbLastFragmentSize,
unsigned int uMACfragNum,
unsigned char byFBOption,
- unsigned short wCurrentRate,
+ unsigned short current_rate,
bool is_pspoll
)
{
@@ -451,7 +451,7 @@ s_uFillDataHead(
if (byFBOption == AUTO_FB_NONE) {
struct vnt_tx_datahead_g *buf = pTxDataHead;
/* Get SignalField, ServiceField & Length */
- vnt_get_phy_field(pDevice, cbFrame
