staging: rtl8192e: Rename RFInProgres.., bEnableHT and RegChannelPlan

Rename variable RFInProgressTimeOut to rf_in_progress_timeout, bEnableHT
to enable_ht and RegChannelPlan to reg_chnl_plan 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/aa3b8fd4a51fc9b1c32566cd079590bf11a9190d.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 bbaf20f..d0ce898 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -474,10 +474,10 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 
        priv->rf_chip = RF_8256;
 
-       if (priv->RegChannelPlan == 0xf)
+       if (priv->reg_chnl_plan == 0xf)
                priv->ChannelPlan = priv->eeprom_ChannelPlan;
        else
-               priv->ChannelPlan = priv->RegChannelPlan;
+               priv->ChannelPlan = priv->reg_chnl_plan;
 
        if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->CustomerID =  RT_CID_DLINK;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 144bc7c..1bf5e76 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -672,9 +672,9 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)
 
        if ((wireless_mode == WIRELESS_MODE_N_24G) ||
            (wireless_mode == WIRELESS_MODE_N_5G)) {
-               priv->rtllib->pHTInfo->bEnableHT = 1;
+               priv->rtllib->pHTInfo->enable_ht = 1;
        } else {
-               priv->rtllib->pHTInfo->bEnableHT = 0;
+               priv->rtllib->pHTInfo->enable_ht = 0;
        }
        _rtl92e_refresh_support_rate(priv);
 }
@@ -723,7 +723,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        unsigned long flags = 0;
-       u8 RFInProgressTimeOut = 0;
+       u8 rf_in_progress_timeout = 0;
 
        if (priv->up == 0)
                return -1;
@@ -755,12 +755,12 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)
        spin_lock_irqsave(&priv->rf_ps_lock, flags);
        while (priv->rf_change_in_progress) {
                spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
-               if (RFInProgressTimeOut > 100) {
+               if (rf_in_progress_timeout > 100) {
                        spin_lock_irqsave(&priv->rf_ps_lock, flags);
                        break;
                }
                mdelay(1);
-               RFInProgressTimeOut++;
+               rf_in_progress_timeout++;
                spin_lock_irqsave(&priv->rf_ps_lock, flags);
        }
        priv->rf_change_in_progress = true;
@@ -845,7 +845,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->rxringcount = MAX_RX_COUNT;
        priv->irq_enabled = 0;
        priv->chan = 1;
-       priv->RegChannelPlan = 0xf;
+       priv->reg_chnl_plan = 0xf;
        priv->rtllib->mode = WIRELESS_MODE_AUTO;
        priv->rtllib->iw_mode = IW_MODE_INFRA;
        priv->rtllib->bNetPromiscuousMode = false;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 1ae3c77..98c7507 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -467,7 +467,7 @@ struct r8192_priv {
 
        bool bTXPowerDataReadFromEEPORM;
 
-       u16 RegChannelPlan;
+       u16 reg_chnl_plan;
        u16 ChannelPlan;
        u8 bHwRfOffAction;
 

diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 76bc9c5..22e4f12 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -96,7 +96,7 @@ enum ht_aggre_mode {
 
 
 struct rt_hi_throughput {
-       u8                              bEnableHT;
+       u8                              enable_ht;
        u8                              bCurrentHTSupport;
 
        u8                              bRegBW40MHz;

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 2092ebf..2c4c1cb 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -690,7 +690,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
        struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
        u8      bIOTAction = 0;
 
-       /* unmark bEnableHT flag here is the same reason why unmarked in
+       /* unmark enable_ht flag here is the same reason why unmarked in
         * function rtllib_softmac_new_net. WB 2008.09.10
         */
        if (pNetwork->bssht.bd_support_ht) {
@@ -776,7 +776,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee)
 {
        struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
 
-       if (pHTInfo->bEnableHT) {
+       if (pHTInfo->enable_ht) {
                pHTInfo->bCurrentHTSupport = true;
                pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK;
 

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index ee4173a..ac8132d 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1179,11 +1179,11 @@ rtllib_association_req(struct rtllib_network *beacon,
        if ((ieee->rtllib_ap_sec_type &&
            (ieee->rtllib_ap_sec_type(ieee) & SEC_ALG_TKIP)) ||
            ieee->bForcedBgMode) {
-               ieee->pHTInfo->bEnableHT = 0;
+               ieee->pHTInfo->enable_ht = 0;
                ieee->mode = WIRELESS_MODE_G;
        }
 
-       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) {
+       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {
                ht_cap_buf = (u8 *)&(ieee->pHTInfo->SelfHTCap);
                ht_cap_len = sizeof(ieee->pHTInfo->SelfHTCap);
                HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len,
@@ -1324,7 +1324,7 @@ rtllib_association_req(struct rtllib_network *beacon,
                memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length);
                tag += osCcxVerNum.Length;
        }
-       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) {
+       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {
                if (ieee->pHTInfo->ePeerHTSpecVer != HT_SPEC_VER_EWC) {
                        tag = skb_put(skb, ht_cap_len);
                        *tag++ = MFIE_TYPE_HT_CAP;
@@ -1358,7 +1358,7 @@ rtllib_association_req(struct rtllib_network *beacon,
                rtllib_TURBO_Info(ieee, &tag);
        }
 
-       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) {
+       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {
                if (ieee->pHTInfo->ePeerHTSpecVer == HT_SPEC_VER_EWC) {
                        tag = skb_put(skb, ht_cap_len);
                        *tag++ = MFIE_TYPE_GENERIC;
@@ -1524,14 +1524,14 @@ static void rtllib_associate_complete_wq(void *data)
                ieee->SetWirelessMode(ieee->dev, IEEE_B);
                netdev_info(ieee->dev, "Using B rates:%d\n", ieee->rate);
        }
-       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) {
+       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) {
                netdev_info(ieee->dev, "Successfully associated, ht enabled\n");
                HTOnAssocRsp(ieee);
        } else {
                netdev_info(ieee->dev,
                            "Successfully associated, ht not enabled(%d, %d)\n",
                            ieee->pHTInfo->bCurrentHTSupport,
-                           ieee->pHTInfo->bEnableHT);
+                           ieee->pHTInfo->enable_ht);
                memset(ieee->dot11ht_oper_rate_set, 0, 16);
        }
        ieee->LinkDetectInfo.SlotNum = 2 * (1 +
@@ -1684,7 +1684,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
                                    ieee->current_network.ssid,
                                    ieee->current_network.channel,
                                    ieee->current_network.qos_data.supported,
-                                   ieee->pHTInfo->bEnableHT,
+                                   ieee->pHTInfo->enable_ht,
                                    ieee->current_network.bssht.bd_support_ht,
                                    ieee->current_network.mode,
                                    ieee->current_network.flags);

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index fdf867a..7bac30b 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -359,7 +359,7 @@ void rtllib_wx_sync_scan_wq(void *data)
        if (ieee->ScanOperationBackupHandler)
                ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
 
-       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT &&
+       if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht &&
            ieee->pHTInfo->bCurBW40MHz) {
                b40M = 1;
                chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index be3779e..8b01cfe 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -273,7 +273,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
        if (rtllib_act_scanning(ieee, false))
                return;
 
-       if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT)
+       if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht)
                return;
        if (!IsQoSDataFrame(skb->data))
                return;
@@ -354,7 +354,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
 
        tcb_desc->bUseShortGI           = false;
 
-       if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT)
+       if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht)
                return;
 
        if (pHTInfo->forced_short_gi) {
@@ -375,7 +375,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee,
 
        tcb_desc->bPacketBW = false;
 
-       if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT)
+       if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht)
                return;
 
        if (tcb_desc->bMulticast || tcb_desc->bBroadcast)
@@ -438,7 +438,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,
                        tcb_desc->rts_rate = MGN_24M;
                        break;
                }
-               if (pHTInfo->bCurrentHTSupport  && pHTInfo->bEnableHT) {
+               if (pHTInfo->bCurrentHTSupport  && pHTInfo->enable_ht) {
                        u8 HTOpMode = pHTInfo->current_op_mode;
 
                        if ((pHTInfo->bCurBW40MHz && (HTOpMode == 2 ||