Rename variable EEPROMThermalMeter to eeprom_thermal_meter, EEPROMAntPwDiff to eeprom_ant_pwr_diff and EEPROMTxPowerLevelOFDM24G to eeprom_tx_pwr_level_ofdm24g to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx> --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 28 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index df8cdea5ee95..655a7966a876 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -366,22 +366,22 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) } if (!priv->AutoloadFailFlag) - priv->EEPROMThermalMeter = ((rtl92e_eeprom_read(dev, + priv->eeprom_thermal_meter = ((rtl92e_eeprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00) >> 8; else - priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter; - priv->tssi_13dBm = priv->EEPROMThermalMeter * 100; + priv->eeprom_thermal_meter = EEPROM_Default_ThermalMeter; + priv->tssi_13dBm = priv->eeprom_thermal_meter * 100; if (priv->epromtype == EEPROM_93C46) { if (!priv->AutoloadFailFlag) { usValue = rtl92e_eeprom_read(dev, EEPROM_TxPwDiff_CrystalCap >> 1); - priv->EEPROMAntPwDiff = usValue & 0x0fff; + priv->eeprom_ant_pwr_diff = usValue & 0x0fff; priv->eeprom_crystal_cap = (usValue & 0xf000) >> 12; } else { - priv->EEPROMAntPwDiff = + priv->eeprom_ant_pwr_diff = EEPROM_Default_AntTxPowerDiff; priv->eeprom_crystal_cap = EEPROM_Default_TxPwDiff_CrystalCap; @@ -402,7 +402,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) (EEPROM_TxPwIndex_OFDM_24G + i) >> 1); else usValue = EEPROM_Default_TxPower; - *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i])) + *((u16 *)(&priv->eeprom_tx_pwr_level_ofdm24g[i])) = usValue; } } @@ -411,18 +411,18 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->tx_pwr_level_cck[i] = priv->EEPROMTxPowerLevelCCK[i]; priv->tx_pwr_level_ofdm_24g[i] = - priv->EEPROMTxPowerLevelOFDM24G[i]; + priv->eeprom_tx_pwr_level_ofdm24g[i]; } priv->legacy_ht_tx_pwr_diff = priv->eeprom_legacy_ht_tx_pwr_diff; - priv->antenna_tx_pwr_diff[0] = priv->EEPROMAntPwDiff & 0xf; - priv->antenna_tx_pwr_diff[1] = (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[0] = priv->eeprom_ant_pwr_diff & 0xf; + priv->antenna_tx_pwr_diff[1] = (priv->eeprom_ant_pwr_diff & 0xf0) >> 4; - priv->antenna_tx_pwr_diff[2] = (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[2] = (priv->eeprom_ant_pwr_diff & 0xf00) >> 8; priv->crystal_cap = priv->eeprom_crystal_cap; - priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; - priv->thermal_meter[1] = (priv->EEPROMThermalMeter & + priv->thermal_meter[0] = priv->eeprom_thermal_meter & 0xf; + priv->thermal_meter[1] = (priv->eeprom_thermal_meter & 0xf0) >> 4; } else if (priv->epromtype == EEPROM_93C56) { @@ -462,8 +462,8 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[2] = 0; priv->crystal_cap = priv->eeprom_crystal_cap; - priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; - priv->thermal_meter[1] = (priv->EEPROMThermalMeter & + priv->thermal_meter[0] = priv->eeprom_thermal_meter & 0xf; + priv->thermal_meter[1] = (priv->eeprom_thermal_meter & 0xf0) >> 4; } } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 4a2b4f01507e..9cb717892dcb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -423,13 +423,13 @@ struct r8192_priv { u16 eeprom_chnl_plan; u8 EEPROMTxPowerLevelCCK[14]; - u8 EEPROMTxPowerLevelOFDM24G[14]; + u8 eeprom_tx_pwr_level_ofdm24g[14]; u8 EEPROMRfACCKChnl1TxPwLevel[3]; u8 EEPROMRfAOfdmChnlTxPwLevel[3]; u8 EEPROMRfCCCKChnl1TxPwLevel[3]; u8 EEPROMRfCOfdmChnlTxPwLevel[3]; - u16 EEPROMAntPwDiff; - u8 EEPROMThermalMeter; + u16 eeprom_ant_pwr_diff; + u8 eeprom_thermal_meter; u8 eeprom_crystal_cap; u8 eeprom_legacy_ht_tx_pwr_diff; -- 2.39.0