staging: rtl8192e: Rename bTxDisableRate.., RegMaxLPSAwa.. and bTxUseD..

Rename variable bTxDisableRateFallBack to tx_dis_rate_fallback,
RegMaxLPSAwakeIntvl to reg_max_lps_awake_intvl and
bTxUseDriverAssingedRate to tx_use_drv_assinged_rate 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/092eb2dc73d37daf851ea9ef9cb7e4df6f766845.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 210b7ecc273ab404b9d13a0776e1a72eeb450ad3..39aac83d89604208a29e08905ed0a659a4d0d4d5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1136,8 +1136,8 @@ void  rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
                                                          cb_desc->priority);
        pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
 
-       pdesc->DISFB = cb_desc->bTxDisableRateFallBack;
-       pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate;
+       pdesc->DISFB = cb_desc->tx_dis_rate_fallback;
+       pdesc->USERATE = cb_desc->tx_use_drv_assinged_rate;
 
        pdesc->FirstSeg = 1;
        pdesc->LastSeg = 1;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 213aac943ef76309e2f05b5e8737d9b65fe7ea6e..952fe8d7a7be46aa1a0084282c09b6221fe54d86 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -494,8 +494,8 @@ static void _rtl92e_prepare_beacon(struct tasklet_struct *t)
        tcb_desc->queue_index = BEACON_QUEUE;
        tcb_desc->data_rate = 2;
        tcb_desc->RATRIndex = 7;
-       tcb_desc->bTxDisableRateFallBack = 1;
-       tcb_desc->bTxUseDriverAssingedRate = 1;
+       tcb_desc->tx_dis_rate_fallback = 1;
+       tcb_desc->tx_use_drv_assinged_rate = 1;
        skb_push(pnewskb, priv->rtllib->tx_headroom);
 
        pdesc = &ring->desc[0];
@@ -822,7 +822,7 @@ static void _rtl92e_init_priv_constant(struct net_device *dev)
        struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
                                        &priv->rtllib->PowerSaveControl;
 
-       pPSC->RegMaxLPSAwakeIntvl = 5;
+       pPSC->reg_max_lps_awake_intvl = 5;
 }
 
 static void _rtl92e_init_priv_variable(struct net_device *dev)
@@ -1538,8 +1538,8 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        }
 
        tcb_desc->RATRIndex = 7;
-       tcb_desc->bTxDisableRateFallBack = 1;
-       tcb_desc->bTxUseDriverAssingedRate = 1;
+       tcb_desc->tx_dis_rate_fallback = 1;
+       tcb_desc->tx_use_drv_assinged_rate = 1;
        tcb_desc->bTxEnableFwCalcDur = 1;
        skb_push(skb, priv->rtllib->tx_headroom);
        ret = _rtl92e_tx(dev, skb);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 12eea4fcb9ddeff28269beeebe448ac5de813a88..ffef63e8dcaee98671db32704b3d8e6d7d81a523 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -196,7 +196,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net_device *dev,
        netdev_info(dev, "%s(): set lps awake interval ! extra is %d\n",
                    __func__, *extra);
 
-       pPSC->RegMaxLPSAwakeIntvl = *extra;
+       pPSC->reg_max_lps_awake_intvl = *extra;
        mutex_unlock(&priv->wx_mutex);
        return 0;
 }

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 2c0a8d5c8f279d75883afcead1fefe92e8cbbb6f..7fad983ad4be16949ce04f03d87807b4deb97c7e 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -91,8 +91,8 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee)
        pHTInfo->self_mimo_ps = 3;
        if (pHTInfo->self_mimo_ps == 2)
                pHTInfo->self_mimo_ps = 3;
-       ieee->bTxDisableRateFallBack = 0;
-       ieee->bTxUseDriverAssingedRate = 0;
+       ieee->tx_dis_rate_fallback = 0;
+       ieee->tx_use_drv_assinged_rate = 0;
 
        ieee->bTxEnableFwCalcDur = 1;
 

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index e0fa87b12cebbaad024885099a70f9bee79c58eb..ca9e016ffa9fed322c62d6d3a9371b0e9e19efe4 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -126,8 +126,8 @@ struct cb_desc {
        u8 bFirstSeg:1;
        u8 bLastSeg:1;
        u8 bEncrypt:1;
-       u8 bTxDisableRateFallBack:1;
-       u8 bTxUseDriverAssingedRate:1;
+       u8 tx_dis_rate_fallback:1;
+       u8 tx_use_drv_assinged_rate:1;
        u8 bHwSec:1;
 
        u8 nStuckCount;
@@ -1256,7 +1256,7 @@ struct rt_pwr_save_ctrl {
 
        bool                            bLeisurePs;
        u8                              LpsIdleCount;
-       u8                              RegMaxLPSAwakeIntvl;
+       u8                              reg_max_lps_awake_intvl;
        u8                              LPSAwakeIntvl;
 
        u32                             CurPsLevel;
@@ -1441,8 +1441,8 @@ struct rtllib_device {
        u8      RegHTSuppRateSet[16];
        u8      HTCurrentOperaRate;
        u8      HTHighestOperaRate;
-       u8      bTxDisableRateFallBack;
-       u8      bTxUseDriverAssingedRate;
+       u8      tx_dis_rate_fallback;
+       u8      tx_use_drv_assinged_rate;
        u8      bTxEnableFwCalcDur;
        atomic_t        atm_swbw;
 

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 1253de48180537a78aa16d48d39a83907332310d..604d4fd7e2cdea93edbf81b74aca4fbcb69a21d9 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -220,8 +220,8 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
 
        tcb_desc->data_rate = MgntQuery_MgntFrameTxRate(ieee);
        tcb_desc->RATRIndex = 7;
-       tcb_desc->bTxDisableRateFallBack = 1;
-       tcb_desc->bTxUseDriverAssingedRate = 1;
+       tcb_desc->tx_dis_rate_fallback = 1;
+       tcb_desc->tx_use_drv_assinged_rate = 1;
        if (single) {
                if (ieee->queue_stop) {
                        enqueue_mgmt(ieee, skb);
@@ -298,8 +298,8 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb,
 
        tcb_desc->data_rate = MgntQuery_MgntFrameTxRate(ieee);
        tcb_desc->RATRIndex = 7;
-       tcb_desc->bTxDisableRateFallBack = 1;
-       tcb_desc->bTxUseDriverAssingedRate = 1;
+       tcb_desc->tx_dis_rate_fallback = 1;
+       tcb_desc->tx_use_drv_assinged_rate = 1;
        if (single) {
                if (type != RTLLIB_FTYPE_CTL) {
                        header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
@@ -1996,12 +1996,12 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time)
 
                        if (pPSC->LPSAwakeIntvl == 0)
                                pPSC->LPSAwakeIntvl = 1;
-                       if (pPSC->RegMaxLPSAwakeIntvl == 0)
+                       if (pPSC->reg_max_lps_awake_intvl == 0)
                                MaxPeriod = 1;
-                       else if (pPSC->RegMaxLPSAwakeIntvl == 0xFF)
+                       else if (pPSC->reg_max_lps_awake_intvl == 0xFF)
                                MaxPeriod = ieee->current_network.dtim_period;
                        else
-                               MaxPeriod = pPSC->RegMaxLPSAwakeIntvl;
+                               MaxPeriod = pPSC->reg_max_lps_awake_intvl;
                        pPSC->LPSAwakeIntvl = (pPSC->LPSAwakeIntvl >=
                                               MaxPeriod) ? MaxPeriod :
                                               (pPSC->LPSAwakeIntvl + 1);

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 101f44129145190d2ee5afe176a602585ff9716f..be3779efcd23329d6bb390324e8fa91a6d2f90f7 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -477,13 +477,13 @@ NO_PROTECTION:
 static void rtllib_txrate_selectmode(struct rtllib_device *ieee,
                                     struct cb_desc *tcb_desc)
 {
-       if (ieee->bTxDisableRateFallBack)
-               tcb_desc->bTxDisableRateFallBack = true;
+       if (ieee->tx_dis_rate_fallback)
+               tcb_desc->tx_dis_rate_fallback = true;
 
-       if (ieee->bTxUseDriverAssingedRate)
-               tcb_desc->bTxUseDriverAssingedRate = true;
-       if (!tcb_desc->bTxDisableRateFallBack ||
-           !tcb_desc->bTxUseDriverAssingedRate) {
+       if (ieee->tx_use_drv_assinged_rate)
+               tcb_desc->tx_use_drv_assinged_rate = true;
+       if (!tcb_desc->tx_dis_rate_fallback ||
+           !tcb_desc->tx_use_drv_assinged_rate) {
                if (ieee->iw_mode == IW_MODE_INFRA ||
                    ieee->iw_mode == IW_MODE_ADHOC)
                        tcb_desc->RATRIndex = 0;
@@ -886,14 +886,14 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
                            HT_IOT_ACT_WA_IOT_Broadcom) {
                                tcb_desc->data_rate =
                                         MgntQuery_TxRateExcludeCCKRates(ieee);
-                               tcb_desc->bTxDisableRateFallBack = false;
+                               tcb_desc->tx_dis_rate_fallback = false;
                        } else {
                                tcb_desc->data_rate = ieee->basic_rate;
-                               tcb_desc->bTxDisableRateFallBack = 1;
+                               tcb_desc->tx_dis_rate_fallback = 1;
                        }
 
                        tcb_desc->RATRIndex = 7;
-                       tcb_desc->bTxUseDriverAssingedRate = 1;
+                       tcb_desc->tx_use_drv_assinged_rate = 1;
                } else {
                        if (is_multicast_ether_addr(header.addr1))
                                tcb_desc->bMulticast = 1;
@@ -910,14 +910,14 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
                                    HT_IOT_ACT_WA_IOT_Broadcom) {
                                        tcb_desc->data_rate =
                                           MgntQuery_TxRateExcludeCCKRates(ieee);
-                                       tcb_desc->bTxDisableRateFallBack = false;
+                                       tcb_desc->tx_dis_rate_fallback = false;
                                } else {
                                        tcb_desc->data_rate = MGN_1M;
-                                       tcb_desc->bTxDisableRateFallBack = 1;
+                                       tcb_desc->tx_dis_rate_fallback = 1;
                                }
 
                                tcb_desc->RATRIndex = 7;
-                               tcb_desc->bTxUseDriverAssingedRate = 1;
+                               tcb_desc->tx_use_drv_assinged_rate = 1;
                                tcb_desc->bdhcp = 1;
                        }