staging: rtl8192e: Rename SetBWModeIn.., SwChnlInPro.. and ThermalMet..

Rename variable SetBWModeInProgress to set_bw_mode_in_progress,
SwChnlInProgress to sw_chnl_in_progress and ThermalMeter to thermal_meter
to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/fc8bffbef60dba7aeb3bdfeab031c4e02e551c82.1673812849.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 734a097..1499e6b 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -421,8 +421,8 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                        priv->antenna_tx_pwr_diff[2] = (priv->EEPROMAntPwDiff &
                                                        0xf00) >> 8;
                        priv->CrystalCap = priv->EEPROMCrystalCap;
-                       priv->ThermalMeter[0] = priv->EEPROMThermalMeter & 0xf;
-                       priv->ThermalMeter[1] = (priv->EEPROMThermalMeter &
+                       priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf;
+                       priv->thermal_meter[1] = (priv->EEPROMThermalMeter &
                                                     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->CrystalCap = priv->EEPROMCrystalCap;
-                       priv->ThermalMeter[0] = priv->EEPROMThermalMeter & 0xf;
-                       priv->ThermalMeter[1] = (priv->EEPROMThermalMeter &
+                       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 59b2e83..2af6763 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -954,7 +954,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel)
                netdev_err(dev, "%s(): Driver is not initialized\n", __func__);
                return false;
        }
-       if (priv->SwChnlInProgress)
+       if (priv->sw_chnl_in_progress)
                return false;
 
 
@@ -987,7 +987,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel)
                break;
        }
 
-       priv->SwChnlInProgress = true;
+       priv->sw_chnl_in_progress = true;
        if (channel == 0)
                channel = 1;
 
@@ -998,7 +998,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel)
 
        if (priv->up)
                _rtl92e_phy_switch_channel_work_item(dev);
-       priv->SwChnlInProgress = false;
+       priv->sw_chnl_in_progress = false;
        return true;
 }
 
@@ -1101,7 +1101,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev)
        u8 regBwOpMode;
 
        if (priv->rf_chip == RF_PSEUDO_11N) {
-               priv->SetBWModeInProgress = false;
+               priv->set_bw_mode_in_progress = false;
                return;
        }
        if (!priv->up) {
@@ -1190,7 +1190,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev)
        }
 
        atomic_dec(&(priv->rtllib->atm_swbw));
-       priv->SetBWModeInProgress = false;
+       priv->set_bw_mode_in_progress = false;
 }
 
 void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth,
@@ -1199,11 +1199,11 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth,
        struct r8192_priv *priv = rtllib_priv(dev);
 
 
-       if (priv->SetBWModeInProgress)
+       if (priv->set_bw_mode_in_progress)
                return;
 
        atomic_inc(&(priv->rtllib->atm_swbw));
-       priv->SetBWModeInProgress = true;
+       priv->set_bw_mode_in_progress = true;
 
        priv->CurrentChannelBW = bandwidth;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index ed9ddb2..edc02a6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -435,12 +435,12 @@ struct r8192_priv {
        u8 EEPROMLegacyHTTxPowerDiff;
 
        u8 CrystalCap;
-       u8 ThermalMeter[2];
+       u8 thermal_meter[2];
 
-       u8 SwChnlInProgress;
+       u8 sw_chnl_in_progress;
        u8 SwChnlStage;
        u8 SwChnlStep;
-       u8 SetBWModeInProgress;
+       u8 set_bw_mode_in_progress;
 
        u8 n_cur_40mhz_prime_sc;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 0e278b8..96c45e5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -794,11 +794,11 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
                return;
        if (tmpRegA >= 12)
                tmpRegA = 12;
-       priv->ThermalMeter[0] = ThermalMeterVal;
-       priv->ThermalMeter[1] = ThermalMeterVal;
+       priv->thermal_meter[0] = ThermalMeterVal;
+       priv->thermal_meter[1] = ThermalMeterVal;
 
-       if (priv->ThermalMeter[0] >= (u8)tmpRegA) {
-               tmpOFDMindex = tmpCCK20Mindex = 6+(priv->ThermalMeter[0] -
+       if (priv->thermal_meter[0] >= (u8)tmpRegA) {
+               tmpOFDMindex = tmpCCK20Mindex = 6+(priv->thermal_meter[0] -
                              (u8)tmpRegA);
                tmpCCK40Mindex = tmpCCK20Mindex - 6;
                if (tmpOFDMindex >= OFDM_Table_Length)
@@ -808,7 +808,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
                if (tmpCCK40Mindex >= CCK_Table_length)
                        tmpCCK40Mindex = CCK_Table_length-1;
        } else {
-               tmpval = (u8)tmpRegA - priv->ThermalMeter[0];
+               tmpval = (u8)tmpRegA - priv->thermal_meter[0];
                if (tmpval >= 6) {
                        tmpOFDMindex = 0;
                        tmpCCK20Mindex = 0;