staging: rtl8723au: Tidy up SetTxPowerLevel8723A()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
index 26d7f408eb04c4504043a7151f9334b7d80ceec9..06a6c3eeeb330f1cd1f35587cb16ae93b8af0a4f 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
@@ -765,33 +765,30 @@ PHY_BBConfig8723A(struct rtw_adapter *Adapter)
 void PHY_SetTxPowerLevel8723A(struct rtw_adapter *Adapter, u8 channel)
 {
        struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
-       u8 cckPowerLevel[2], ofdmPowerLevel[2]; /*  [0]:RF-A, [1]:RF-B */
-       int index = channel - 1;
+       u8 cckpwr[2], ofdmpwr[2];       /*  [0]:RF-A, [1]:RF-B */
+       int i = channel - 1;
 
        if (pHalData->bTXPowerDataReadFromEEPORM == false)
                return;
 
        /*  1. CCK */
-       cckPowerLevel[RF_PATH_A] = pHalData->TxPwrLevelCck[RF_PATH_A][index];
-       cckPowerLevel[RF_PATH_B] = pHalData->TxPwrLevelCck[RF_PATH_B][index];
+       cckpwr[RF_PATH_A] = pHalData->TxPwrLevelCck[RF_PATH_A][i];
+       cckpwr[RF_PATH_B] = pHalData->TxPwrLevelCck[RF_PATH_B][i];
 
        /*  2. OFDM for 1S or 2S */
-       if (GET_RF_TYPE(Adapter) == RF_1T2R || GET_RF_TYPE(Adapter) == RF_1T1R) {
+       if (GET_RF_TYPE(Adapter) == RF_1T2R ||
+           GET_RF_TYPE(Adapter) == RF_1T1R) {
                /*  Read HT 40 OFDM TX power */
-               ofdmPowerLevel[RF_PATH_A] =
-                       pHalData->TxPwrLevelHT40_1S[RF_PATH_A][index];
-               ofdmPowerLevel[RF_PATH_B] =
-                       pHalData->TxPwrLevelHT40_1S[RF_PATH_B][index];
+               ofdmpwr[RF_PATH_A] = pHalData->TxPwrLevelHT40_1S[RF_PATH_A][i];
+               ofdmpwr[RF_PATH_B] = pHalData->TxPwrLevelHT40_1S[RF_PATH_B][i];
        } else if (GET_RF_TYPE(Adapter) == RF_2T2R) {
                /*  Read HT 40 OFDM TX power */
-               ofdmPowerLevel[RF_PATH_A] =
-                       pHalData->TxPwrLevelHT40_2S[RF_PATH_A][index];
-               ofdmPowerLevel[RF_PATH_B] =
-                       pHalData->TxPwrLevelHT40_2S[RF_PATH_B][index];
+               ofdmpwr[RF_PATH_A] = pHalData->TxPwrLevelHT40_2S[RF_PATH_A][i];
+               ofdmpwr[RF_PATH_B] = pHalData->TxPwrLevelHT40_2S[RF_PATH_B][i];
        }
 
-       rtl823a_phy_rf6052setccktxpower(Adapter, &cckPowerLevel[0]);
-       rtl8723a_PHY_RF6052SetOFDMTxPower(Adapter, &ofdmPowerLevel[0], channel);
+       rtl823a_phy_rf6052setccktxpower(Adapter, &cckpwr[0]);
+       rtl8723a_PHY_RF6052SetOFDMTxPower(Adapter, &ofdmpwr[0], channel);
 }
 
 /*-----------------------------------------------------------------------------