2023-01-15 20:39:14

by Philipp Hortmann

[permalink] [raw]
Subject: [PATCH 07/10] staging: rtl8192e: Rename CrystalCap, EEPROMLegacyHTT.. and EEPROMCrys..

Rename variable CrystalCap to crystal_cap, EEPROMLegacyHTTxPowerDiff to
eeprom_legacy_ht_tx_pwr_diff and EEPROMCrystalCap to eeprom_crystal_cap
to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by: Philipp Hortmann <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 ++++++++--------
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 1499e6b2fa39..df8cdea5ee95 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -355,14 +355,14 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
if (!priv->AutoloadFailFlag) {
tempval = (rtl92e_eeprom_read(dev,
(EEPROM_RFInd_PowerDiff >> 1))) & 0xff;
- priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;
+ priv->eeprom_legacy_ht_tx_pwr_diff = tempval & 0xf;

if (tempval&0x80)
priv->rf_type = RF_1T2R;
else
priv->rf_type = RF_2T4R;
} else {
- priv->EEPROMLegacyHTTxPowerDiff = 0x04;
+ priv->eeprom_legacy_ht_tx_pwr_diff = 0x04;
}

if (!priv->AutoloadFailFlag)
@@ -378,12 +378,12 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
usValue = rtl92e_eeprom_read(dev,
EEPROM_TxPwDiff_CrystalCap >> 1);
priv->EEPROMAntPwDiff = usValue & 0x0fff;
- priv->EEPROMCrystalCap = (usValue & 0xf000)
+ priv->eeprom_crystal_cap = (usValue & 0xf000)
>> 12;
} else {
priv->EEPROMAntPwDiff =
EEPROM_Default_AntTxPowerDiff;
- priv->EEPROMCrystalCap =
+ priv->eeprom_crystal_cap =
EEPROM_Default_TxPwDiff_CrystalCap;
}

@@ -414,13 +414,13 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
priv->EEPROMTxPowerLevelOFDM24G[i];
}
priv->legacy_ht_tx_pwr_diff =
- priv->EEPROMLegacyHTTxPowerDiff;
+ priv->eeprom_legacy_ht_tx_pwr_diff;
priv->antenna_tx_pwr_diff[0] = priv->EEPROMAntPwDiff & 0xf;
priv->antenna_tx_pwr_diff[1] = (priv->EEPROMAntPwDiff &
0xf0) >> 4;
priv->antenna_tx_pwr_diff[2] = (priv->EEPROMAntPwDiff &
0xf00) >> 8;
- priv->CrystalCap = priv->EEPROMCrystalCap;
+ priv->crystal_cap = priv->eeprom_crystal_cap;
priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf;
priv->thermal_meter[1] = (priv->EEPROMThermalMeter &
0xf0) >> 4;
@@ -457,11 +457,11 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
priv->EEPROMRfCOfdmChnlTxPwLevel[2];
}
priv->legacy_ht_tx_pwr_diff =
- priv->EEPROMLegacyHTTxPowerDiff;
+ priv->eeprom_legacy_ht_tx_pwr_diff;
priv->antenna_tx_pwr_diff[0] = 0;
priv->antenna_tx_pwr_diff[1] = 0;
priv->antenna_tx_pwr_diff[2] = 0;
- priv->CrystalCap = priv->EEPROMCrystalCap;
+ priv->crystal_cap = priv->eeprom_crystal_cap;
priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf;
priv->thermal_meter[1] = (priv->EEPROMThermalMeter &
0xf0) >> 4;
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 2af6763707d0..6da76ea16ff1 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -544,7 +544,7 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev)
(bXBTxAGC|bXCTxAGC|bXDTxAGC), dwRegValue);


- dwRegValue = priv->CrystalCap;
+ dwRegValue = priv->crystal_cap;
rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, bXtalCap92x,
dwRegValue);
}
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index edc02a61a92d..4a2b4f01507e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -430,11 +430,11 @@ struct r8192_priv {
u8 EEPROMRfCOfdmChnlTxPwLevel[3];
u16 EEPROMAntPwDiff;
u8 EEPROMThermalMeter;
- u8 EEPROMCrystalCap;
+ u8 eeprom_crystal_cap;

- u8 EEPROMLegacyHTTxPowerDiff;
+ u8 eeprom_legacy_ht_tx_pwr_diff;

- u8 CrystalCap;
+ u8 crystal_cap;
u8 thermal_meter[2];

u8 sw_chnl_in_progress;
--
2.39.0