staging: rtl8192e: Rename eRfSleep, eRfPowerStateToSet and RfOffReason

Rename variable eRfSleep to rf_sleep, eRfPowerStateToSet to
rf_power_state_to_set and RfOffReason to rf_off_reason to avoid CamelCase
which is not accepted by checkpatch. Omit the upfront "e" as no RfSleep
and RfPowerStateToSet exist and it makes the variables unnecessary long.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/58e21e5cf86270edae93162db2395e6348c9c424.1664055213.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 cb8b5fd..bd2696c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -758,13 +758,13 @@ start:
 
        if (priv->RegRfOff) {
                rtl92e_set_rf_state(dev, rf_off, RF_CHANGE_BY_SW);
-       } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {
-               rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason);
-       } else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {
-               rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason);
+       } else if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_PS) {
+               rtl92e_set_rf_state(dev, rf_off, priv->rtllib->rf_off_reason);
+       } else if (priv->rtllib->rf_off_reason >= RF_CHANGE_BY_IPS) {
+               rtl92e_set_rf_state(dev, rf_off, priv->rtllib->rf_off_reason);
        } else {
                priv->rtllib->rf_power_state = rf_on;
-               priv->rtllib->RfOffReason = 0;
+               priv->rtllib->rf_off_reason = 0;
        }
 
        if (priv->rtllib->FwRWRF)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index c81907d..594db05 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -1363,7 +1363,7 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,
 
                        break;
 
-               case eRfSleep:
+               case rf_sleep:
                        if (priv->rtllib->rf_power_state == rf_off)
                                break;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 5faf17d..4226bba 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -83,7 +83,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
        rt_state = priv->rtllib->rf_power_state;
        if (priv->rtllib->PowerSaveControl.bInactivePs) {
                if (rt_state == rf_off) {
-                       if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) {
+                       if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) {
                                netdev_warn(dev, "%s(): RF is OFF.\n",
                                            __func__);
                                return;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 8954d1e..52b25df 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -170,13 +170,13 @@ bool rtl92e_set_rf_state(struct net_device *dev,
 
        switch (state_to_set) {
        case rf_on:
-               priv->rtllib->RfOffReason &= (~change_source);
+               priv->rtllib->rf_off_reason &= (~change_source);
 
                if ((change_source == RF_CHANGE_BY_HW) && priv->hw_radio_off)
                        priv->hw_radio_off = false;
 
-               if (!priv->rtllib->RfOffReason) {
-                       priv->rtllib->RfOffReason = 0;
+               if (!priv->rtllib->rf_off_reason) {
+                       priv->rtllib->rf_off_reason = 0;
                        action_allowed = true;
 
                        if (rt_state == rf_off &&
@@ -189,7 +189,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,
 
                if ((priv->rtllib->iw_mode == IW_MODE_INFRA) ||
                    (priv->rtllib->iw_mode == IW_MODE_ADHOC)) {
-                       if ((priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) ||
+                       if ((priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) ||
                            (change_source > RF_CHANGE_BY_IPS)) {
                                if (ieee->state == RTLLIB_LINKED)
                                        priv->blinked_ingpio = true;
@@ -201,12 +201,12 @@ bool rtl92e_set_rf_state(struct net_device *dev,
                }
                if ((change_source == RF_CHANGE_BY_HW) && !priv->hw_radio_off)
                        priv->hw_radio_off = true;
-               priv->rtllib->RfOffReason |= change_source;
+               priv->rtllib->rf_off_reason |= change_source;
                action_allowed = true;
                break;
 
-       case eRfSleep:
-               priv->rtllib->RfOffReason |= change_source;
+       case rf_sleep:
+               priv->rtllib->rf_off_reason |= change_source;
                action_allowed = true;
                break;
 
@@ -882,7 +882,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->RegRfOff = false;
        priv->isRFOff = false;
        priv->bInPowerSaveMode = false;
-       priv->rtllib->RfOffReason = 0;
+       priv->rtllib->rf_off_reason = 0;
        priv->rf_change_in_progress = false;
        priv->bHwRfOffAction = 0;
        priv->SetRFPowerStateInProgress = false;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index e4aef75..2f8882c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1665,7 +1665,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
                                  struct r8192_priv, gpio_change_rf_wq);
        struct net_device *dev = priv->rtllib->dev;
        u8 tmp1byte;
-       enum rt_rf_power_state eRfPowerStateToSet;
+       enum rt_rf_power_state rf_power_state_to_set;
        bool bActuallySet = false;
        char *argv[3];
        static const char RadioPowerPath[] = "/etc/acpi/events/RadioPower.sh";
@@ -1684,13 +1684,13 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
 
        tmp1byte = rtl92e_readb(dev, GPI);
 
-       eRfPowerStateToSet = (tmp1byte&BIT1) ?  rf_on : rf_off;
+       rf_power_state_to_set = (tmp1byte&BIT1) ?  rf_on : rf_off;
 
-       if (priv->hw_radio_off && (eRfPowerStateToSet == rf_on)) {
+       if (priv->hw_radio_off && (rf_power_state_to_set == rf_on)) {
                netdev_info(dev, "gpiochangeRF  - HW Radio ON\n");
                priv->hw_radio_off = false;
                bActuallySet = true;
-       } else if (!priv->hw_radio_off && (eRfPowerStateToSet == rf_off)) {
+       } else if (!priv->hw_radio_off && (rf_power_state_to_set == rf_off)) {
                netdev_info(dev, "gpiochangeRF  - HW Radio OFF\n");
                priv->hw_radio_off = true;
                bActuallySet = true;
@@ -1699,7 +1699,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
        if (bActuallySet) {
                mdelay(1000);
                priv->bHwRfOffAction = 1;
-               rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW);
+               rtl92e_set_rf_state(dev, rf_power_state_to_set, RF_CHANGE_BY_HW);
                if (priv->hw_radio_off)
                        argv[1] = "RFOFF";
                else

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index b434543..8c00b11 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -26,7 +26,7 @@ static void _rtl92e_hw_sleep(struct net_device *dev)
                return;
        }
        spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
-       rtl92e_set_rf_state(dev, eRfSleep, RF_CHANGE_BY_PS);
+       rtl92e_set_rf_state(dev, rf_sleep, RF_CHANGE_BY_PS);
 }
 
 void rtl92e_hw_sleep_wq(void *data)
@@ -139,7 +139,7 @@ void rtl92e_ips_leave(struct net_device *dev)
        if (pPSC->bInactivePs) {
                rt_state = priv->rtllib->rf_power_state;
                if (rt_state != rf_on  && !pPSC->bSwRfProcessing &&
-                   priv->rtllib->RfOffReason <= RF_CHANGE_BY_IPS) {
+                   priv->rtllib->rf_off_reason <= RF_CHANGE_BY_IPS) {
                        pPSC->eInactivePowerState = rf_on;
                        priv->bInPowerSaveMode = false;
                        _rtl92e_ps_update_rf_state(dev);
@@ -168,7 +168,7 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *dev)
 
        if (priv->rtllib->PowerSaveControl.bInactivePs) {
                if (rt_state == rf_off) {
-                       if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) {
+                       if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) {
                                netdev_warn(dev, "%s(): RF is OFF.\n",
                                            __func__);
                                return;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 4c9ff1b..4920cb4 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -254,7 +254,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,
            ieee->bNetPromiscuousMode) {
                if (priv->rtllib->PowerSaveControl.bInactivePs) {
                        if (rt_state == rf_off) {
-                               if (priv->rtllib->RfOffReason >
+                               if (priv->rtllib->rf_off_reason >
                                    RF_CHANGE_BY_IPS) {
                                        netdev_warn(dev, "%s(): RF is OFF.\n",
                                                    __func__);
@@ -416,7 +416,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
        if (priv->rtllib->state != RTLLIB_LINKED) {
                if (priv->rtllib->PowerSaveControl.bInactivePs) {
                        if (rt_state == rf_off) {
-                               if (priv->rtllib->RfOffReason >
+                               if (priv->rtllib->rf_off_reason >
                                    RF_CHANGE_BY_IPS) {
                                        netdev_warn(dev, "%s(): RF is OFF.\n",
                                                    __func__);

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 6b5c596..f7c786c 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1245,7 +1245,7 @@ enum ips_callback_function {
 
 enum rt_rf_power_state {
        rf_on,
-       eRfSleep,
+       rf_sleep,
        rf_off
 };
 
@@ -1435,7 +1435,7 @@ struct rtllib_device {
        bool be_scan_inprogress;
        bool beinretry;
        enum rt_rf_power_state rf_power_state;
-       RT_RF_CHANGE_SOURCE     RfOffReason;
+       RT_RF_CHANGE_SOURCE rf_off_reason;
        bool is_set_key;
        bool wx_set_enc;
        struct rt_hi_throughput *pHTInfo;