staging: rtl8192e: Rename InterruptLog, RxCounter and bHwRfOffAction

Rename variable InterruptLog to int_log, RxCounter to rx_ctr and
bHwRfOffAction to hw_rf_off_action 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/82ea07ddd894ac9b863ce90ddb9ba78065bd1f4e.1668313325.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 0eeb9b2daefce7ec42827d0b6c4d138ca9df77b2..e530f917fd2310105643532b3a8929cd05ceb1fc 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1928,7 +1928,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
        if (!reset) {
                mdelay(150);
 
-               priv->bHwRfOffAction = 2;
+               priv->hw_rf_off_action = 2;
 
                if (!priv->rtllib->bSupportRemoteWakeUp) {
                        rtl92e_set_rf_off(dev);
@@ -2129,7 +2129,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev)
 
        SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum;
 
-       if (priv->RxCounter == RegRxCounter) {
+       if (priv->rx_ctr == RegRxCounter) {
                priv->SilentResetRxStuckEvent[SlotIndex] = 1;
 
                for (i = 0; i < SilentResetRxSoltNum; i++)
@@ -2147,7 +2147,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev)
                priv->SilentResetRxStuckEvent[SlotIndex] = 0;
        }
 
-       priv->RxCounter = RegRxCounter;
+       priv->rx_ctr = RegRxCounter;
 
        return bStuck;
 }

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index ac3c7f047ca2df5908574b447dc93588623b32b4..a813eded4cb3f4747f4b13e19e1c9a6e4d367fa3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -1342,7 +1342,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,
                                mdelay(1);
                                rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1,
                                                 0x4, 0x1);
-                               priv->bHwRfOffAction = 0;
+                               priv->hw_rf_off_action = 0;
 
                                rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE,
                                                  BIT4, 0x1);
@@ -1450,7 +1450,7 @@ bool rtl92e_set_rf_power_state(struct net_device *dev,
        bool bResult = false;
 
        if (rf_power_state == priv->rtllib->rf_power_state &&
-           priv->bHwRfOffAction == 0) {
+           priv->hw_rf_off_action == 0) {
                return bResult;
        }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 1c4985dcc5eb17ae6468925f26881c092a11994d..43601ec8d9032ed3bda2899c1f8c6c86163b67f3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -869,13 +869,13 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->force_reset = false;
        memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
 
-       memset(&priv->InterruptLog, 0, sizeof(struct log_int_8190));
-       priv->RxCounter = 0;
+       memset(&priv->int_log, 0, sizeof(struct log_int_8190));
+       priv->rx_ctr = 0;
        priv->rtllib->wx_set_enc = 0;
        priv->hw_radio_off = false;
        priv->rtllib->rf_off_reason = 0;
        priv->rf_change_in_progress = false;
-       priv->bHwRfOffAction = 0;
+       priv->hw_rf_off_action = 0;
        priv->SetRFPowerStateInProgress = false;
        priv->rtllib->pwr_save_ctrl.bLeisurePs = true;
        priv->rtllib->LPSDelayCnt = 0;
@@ -2189,7 +2189,7 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)
 
        if (inta & IMR_ROK) {
                priv->stats.rxint++;
-               priv->InterruptLog.nIMR_ROK++;
+               priv->int_log.nIMR_ROK++;
                tasklet_schedule(&priv->irq_rx_tasklet);
        }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index dfbc9fbcc1297bec6a357d39c29ef20e8a47a2e3..b1656d4ecbad6333f809a12711b04427db815abd 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -330,7 +330,7 @@ struct r8192_priv {
 
        struct work_struct                              reset_wq;
 
-       struct log_int_8190 InterruptLog;
+       struct log_int_8190 int_log;
 
        enum rt_customer_id CustomerID;
 
@@ -469,7 +469,7 @@ struct r8192_priv {
 
        u16 reg_chnl_plan;
        u16 ChannelPlan;
-       u8 bHwRfOffAction;
+       u8 hw_rf_off_action;
 
        bool rf_change_in_progress;
        bool SetRFPowerStateInProgress;
@@ -538,7 +538,7 @@ struct r8192_priv {
 
        enum reset_type rst_progress;
        u16             TxCounter;
-       u16             RxCounter;
+       u16             rx_ctr;
        bool            bResetInProgress;
        bool            force_reset;
        bool            force_lps;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 234e85a25d4591cff23634cfcedfadfa04b0acef..e0f6f1405c17eff40b536d004d0297f3cb0a82f3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1693,7 +1693,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
 
        if (bActuallySet) {
                mdelay(1000);
-               priv->bHwRfOffAction = 1;
+               priv->hw_rf_off_action = 1;
                rtl92e_set_rf_state(dev, rf_power_state_to_set, RF_CHANGE_BY_HW);
                if (priv->hw_radio_off)
                        argv[1] = "RFOFF";