staging: rtl8192e: Rename bLastDTPFlag_Low, OFDM_index and CCK_index
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Sun, 15 Jan 2023 20:19:56 +0000 (21:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jan 2023 18:29:03 +0000 (19:29 +0100)
Rename variable bLastDTPFlag_Low to last_dtp_flag_low, OFDM_index to
ofdm_index and CCK_index to cck_index 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/1058b8be954b634f5c2cd9d4a46c33dbbe9459c5.1673812849.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.h
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

index 2e9932a..7ba60d9 100644 (file)
@@ -1074,11 +1074,11 @@ static void _rtl92e_cck_tx_power_track_bw_switch_thermal(struct net_device *dev)
        case HT_CHANNEL_WIDTH_20:
                if (priv->Record_CCK_20Mindex == 0)
                        priv->Record_CCK_20Mindex = 6;
-               priv->CCK_index = priv->Record_CCK_20Mindex;
+               priv->cck_index = priv->Record_CCK_20Mindex;
        break;
 
        case HT_CHANNEL_WIDTH_20_40:
-               priv->CCK_index = priv->Record_CCK_40Mindex;
+               priv->cck_index = priv->Record_CCK_40Mindex;
        break;
        }
        rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
index 1f8bfe8..fea5f54 100644 (file)
@@ -483,7 +483,7 @@ struct r8192_priv {
        bool            dynamic_tx_high_pwr;
        bool            dynamic_tx_low_pwr;
        bool            last_dtp_flag_high;
-       bool            bLastDTPFlag_Low;
+       bool            last_dtp_flag_low;
 
        u8              rfa_txpowertrackingindex;
        u8              rfa_txpowertrackingindex_real;
@@ -496,8 +496,8 @@ struct r8192_priv {
        u8              txpower_count;
        bool            btxpower_trackingInit;
 
-       u8              OFDM_index[2];
-       u8              CCK_index;
+       u8              ofdm_index[2];
+       u8              cck_index;
 
        u8              Record_CCK_20Mindex;
        u8              Record_CCK_40Mindex;
index 09ea3a6..f03b479 100644 (file)
@@ -775,13 +775,13 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
                                            bMaskDWord);
                for (i = 0; i < OFDM_Table_Length; i++) {
                        if (tmpRegA == OFDMSwingTable[i])
-                               priv->OFDM_index[0] = i;
+                               priv->ofdm_index[0] = i;
                }
 
                TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2);
                for (i = 0; i < CCK_Table_length; i++) {
                        if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
-                               priv->CCK_index = i;
+                               priv->cck_index = i;
                                break;
                        }
                }
@@ -836,17 +836,17 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
                CCKSwingNeedUpdate = 1;
        }
 
-       if (priv->CCK_index != tmpCCKindex) {
-               priv->CCK_index = tmpCCKindex;
+       if (priv->cck_index != tmpCCKindex) {
+               priv->cck_index = tmpCCKindex;
                CCKSwingNeedUpdate = 1;
        }
 
        if (CCKSwingNeedUpdate)
                rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
-       if (priv->OFDM_index[0] != tmpOFDMindex) {
-               priv->OFDM_index[0] = tmpOFDMindex;
+       if (priv->ofdm_index[0] != tmpOFDMindex) {
+               priv->ofdm_index[0] = tmpOFDMindex;
                rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord,
-                                 OFDMSwingTable[priv->OFDM_index[0]]);
+                                 OFDMSwingTable[priv->ofdm_index[0]]);
        }
        priv->txpower_count = 0;
 }
@@ -1005,30 +1005,30 @@ static void _rtl92e_dm_cck_tx_power_adjust_thermal_meter(struct net_device *dev,
 
        TempVal = 0;
        if (!bInCH14) {
-               TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][0] +
-                         (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1] << 8);
+               TempVal = CCKSwingTable_Ch1_Ch13[priv->cck_index][0] +
+                         (CCKSwingTable_Ch1_Ch13[priv->cck_index][1] << 8);
                rtl92e_set_bb_reg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
-               TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][2] +
-                         (CCKSwingTable_Ch1_Ch13[priv->CCK_index][3] << 8) +
-                         (CCKSwingTable_Ch1_Ch13[priv->CCK_index][4] << 16)+
-                         (CCKSwingTable_Ch1_Ch13[priv->CCK_index][5] << 24);
+               TempVal = CCKSwingTable_Ch1_Ch13[priv->cck_index][2] +
+                         (CCKSwingTable_Ch1_Ch13[priv->cck_index][3] << 8) +
+                         (CCKSwingTable_Ch1_Ch13[priv->cck_index][4] << 16)+
+                         (CCKSwingTable_Ch1_Ch13[priv->cck_index][5] << 24);
                rtl92e_set_bb_reg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
-               TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][6] +
-                         (CCKSwingTable_Ch1_Ch13[priv->CCK_index][7] << 8);
+               TempVal = CCKSwingTable_Ch1_Ch13[priv->cck_index][6] +
+                         (CCKSwingTable_Ch1_Ch13[priv->cck_index][7] << 8);
 
                rtl92e_set_bb_reg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
        } else {
-               TempVal = CCKSwingTable_Ch14[priv->CCK_index][0] +
-                         (CCKSwingTable_Ch14[priv->CCK_index][1] << 8);
+               TempVal = CCKSwingTable_Ch14[priv->cck_index][0] +
+                         (CCKSwingTable_Ch14[priv->cck_index][1] << 8);
 
                rtl92e_set_bb_reg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
-               TempVal = CCKSwingTable_Ch14[priv->CCK_index][2] +
-                         (CCKSwingTable_Ch14[priv->CCK_index][3] << 8) +
-                         (CCKSwingTable_Ch14[priv->CCK_index][4] << 16)+
-                         (CCKSwingTable_Ch14[priv->CCK_index][5] << 24);
+               TempVal = CCKSwingTable_Ch14[priv->cck_index][2] +
+                         (CCKSwingTable_Ch14[priv->cck_index][3] << 8) +
+                         (CCKSwingTable_Ch14[priv->cck_index][4] << 16)+
+                         (CCKSwingTable_Ch14[priv->cck_index][5] << 24);
                rtl92e_set_bb_reg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
-               TempVal = CCKSwingTable_Ch14[priv->CCK_index][6] +
-                         (CCKSwingTable_Ch14[priv->CCK_index][7]<<8);
+               TempVal = CCKSwingTable_Ch14[priv->cck_index][6] +
+                         (CCKSwingTable_Ch14[priv->cck_index][7]<<8);
 
                rtl92e_set_bb_reg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
        }
@@ -2272,7 +2272,7 @@ static void _rtl92e_dm_init_dynamic_tx_power(struct net_device *dev)
 
        priv->rtllib->bdynamic_txpower_enable = true;
        priv->last_dtp_flag_high = false;
-       priv->bLastDTPFlag_Low = false;
+       priv->last_dtp_flag_low = false;
        priv->dynamic_tx_high_pwr = false;
        priv->dynamic_tx_low_pwr = false;
 }
@@ -2316,11 +2316,11 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev)
        }
 
        if ((priv->dynamic_tx_high_pwr != priv->last_dtp_flag_high) ||
-           (priv->dynamic_tx_low_pwr != priv->bLastDTPFlag_Low)) {
+           (priv->dynamic_tx_low_pwr != priv->last_dtp_flag_low)) {
                rtl92e_set_tx_power(dev, priv->rtllib->current_network.channel);
        }
        priv->last_dtp_flag_high = priv->dynamic_tx_high_pwr;
-       priv->bLastDTPFlag_Low = priv->dynamic_tx_low_pwr;
+       priv->last_dtp_flag_low = priv->dynamic_tx_low_pwr;
 
 }