staging: rtl8192e: Rename ChannelPlan, eeprom_ChannelPlan and CckPwEnl

Rename variable ChannelPlan to chnl_plan, eeprom_ChannelPlan to
eeprom_chnl_plan and CckPwEnl to cck_pwr_enl 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/aee78a6adf41a2096898e0c0c5ef45e9f7e1659b.1673290428.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
index ab2e9b7..93928f3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
@@ -154,7 +154,7 @@ void rtl92e_set_cck_tx_power(struct net_device *dev, u8 powerlevel)
                if (priv->CustomerID == RT_CID_819x_Netcore)
                        TxAGC = 0x22;
                else
-                       TxAGC += priv->CckPwEnl;
+                       TxAGC += priv->cck_pwr_enl;
        }
        if (TxAGC > 0x24)
                TxAGC = 0x24;

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index f02e67f..25fa771 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -306,7 +306,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                priv->eeprom_CustomerID = usValue & 0xff;
                usValue = rtl92e_eeprom_read(dev,
                                             EEPROM_ICVersion_ChannelPlan>>1);
-               priv->eeprom_ChannelPlan = usValue&0xff;
+               priv->eeprom_chnl_plan = usValue&0xff;
                IC_Version = (usValue & 0xff00)>>8;
 
                ICVer8192 = IC_Version & 0xf;
@@ -328,7 +328,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                priv->eeprom_vid = 0;
                priv->eeprom_did = 0;
                priv->eeprom_CustomerID = 0;
-               priv->eeprom_ChannelPlan = 0;
+               priv->eeprom_chnl_plan = 0;
        }
 
        if (!priv->AutoloadFailFlag) {
@@ -473,9 +473,9 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
        priv->rf_chip = RF_8256;
 
        if (priv->reg_chnl_plan == 0xf)
-               priv->ChannelPlan = priv->eeprom_ChannelPlan;
+               priv->chnl_plan = priv->eeprom_chnl_plan;
        else
-               priv->ChannelPlan = priv->reg_chnl_plan;
+               priv->chnl_plan = priv->reg_chnl_plan;
 
        if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->CustomerID =  RT_CID_DLINK;
@@ -495,10 +495,10 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                break;
        case EEPROM_CID_TOSHIBA:
                priv->CustomerID = RT_CID_TOSHIBA;
-               if (priv->eeprom_ChannelPlan&0x80)
-                       priv->ChannelPlan = priv->eeprom_ChannelPlan&0x7f;
+               if (priv->eeprom_chnl_plan & 0x80)
+                       priv->chnl_plan = priv->eeprom_chnl_plan & 0x7f;
                else
-                       priv->ChannelPlan = 0x0;
+                       priv->chnl_plan = 0x0;
                break;
        case EEPROM_CID_Nettronix:
                priv->CustomerID = RT_CID_Nettronix;
@@ -516,9 +516,9 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                break;
        }
 
-       if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1)
-               priv->ChannelPlan = 0;
-       priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13;
+       if (priv->chnl_plan > CHANNEL_PLAN_LEN - 1)
+               priv->chnl_plan = 0;
+       priv->chnl_plan = COUNTRY_CODE_WORLD_WIDE_13;
 
        if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->rtllib->bSupportRemoteWakeUp = true;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index f8fbe78..92260d0 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -862,7 +862,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->cck_present_attn = 0;
        priv->rfa_txpowertrackingindex = 0;
        priv->rfc_txpowertrackingindex = 0;
-       priv->CckPwEnl = 6;
+       priv->cck_pwr_enl = 6;
        priv->rst_progress = RESET_TYPE_NORESET;
        priv->force_reset = false;
        memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
@@ -952,13 +952,13 @@ static short _rtl92e_get_channel_map(struct net_device *dev)
                return -1;
        }
 
-       if (priv->ChannelPlan >= COUNTRY_CODE_MAX) {
+       if (priv->chnl_plan >= COUNTRY_CODE_MAX) {
                netdev_info(dev,
                            "rtl819x_init:Error channel plan! Set to default.\n");
-               priv->ChannelPlan = COUNTRY_CODE_FCC;
+               priv->chnl_plan = COUNTRY_CODE_FCC;
        }
        dot11d_init(priv->rtllib);
-       dot11d_channel_map(priv->ChannelPlan, priv->rtllib);
+       dot11d_channel_map(priv->chnl_plan, priv->rtllib);
        for (i = 1; i <= 11; i++)
                (priv->rtllib->active_channel_map)[i] = 1;
        (priv->rtllib->active_channel_map)[12] = 2;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index cceb774..93b3b75 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -420,7 +420,7 @@ struct r8192_priv {
        u16 eeprom_vid;
        u16 eeprom_did;
        u8 eeprom_CustomerID;
-       u16 eeprom_ChannelPlan;
+       u16 eeprom_chnl_plan;
 
        u8 EEPROMTxPowerLevelCCK[14];
        u8 EEPROMTxPowerLevelOFDM24G[14];
@@ -451,7 +451,7 @@ struct r8192_priv {
        bool bTXPowerDataReadFromEEPORM;
 
        u16 reg_chnl_plan;
-       u16 ChannelPlan;
+       u16 chnl_plan;
        u8 hw_rf_off_action;
 
        bool rf_change_in_progress;
@@ -460,7 +460,7 @@ struct r8192_priv {
 
        u8 DM_Type;
 
-       u8 CckPwEnl;
+       u8 cck_pwr_enl;
        u16 TSSI_13dBm;
        u32 Pwr_Track;
        u8 CCKPresentAttentuation_20Mdefault;