These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8723au / hal / rtl8723a_phycfg.c

diff --git a/kernel/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c b/kernel/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
index 46a3065..06a6c3e 100644 (file)
--- a/kernel/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
+++ b/kernel/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
@@ -660,7 +660,7 @@ phy_BB8723a_Config_ParaFile(struct rtw_adapter *Adapter)
 
        /*  */
        /*  1. Read PHY_REG.TXT BB INIT!! */
-       /*  We will seperate as 88C / 92C according to chip version */
+       /*  We will separate as 88C / 92C according to chip version */
        /*  */
        ODM_ReadAndConfig_PHY_REG_1T_8723A(&pHalData->odmpriv);
 
@@ -748,36 +748,6 @@ PHY_BBConfig8723A(struct rtw_adapter *Adapter)
        return rtStatus;
 }
 
-static void getTxPowerIndex(struct rtw_adapter *Adapter,
-                           u8 channel, u8 *cckPowerLevel,  u8 *ofdmPowerLevel)
-{
-       struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
-       u8 index = (channel - 1);
-       /*  1. CCK */
-       cckPowerLevel[RF_PATH_A] = pHalData->TxPwrLevelCck[RF_PATH_A][index];
-       cckPowerLevel[RF_PATH_B] = pHalData->TxPwrLevelCck[RF_PATH_B][index];
-
-       /*  2. OFDM for 1S or 2S */
-       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];
-       } 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];
-       }
-}
-
-static void ccxPowerIndexCheck(struct rtw_adapter *Adapter, u8 channel,
-                              u8 *cckPowerLevel, u8 *ofdmPowerLevel)
-{
-}
-
 /*-----------------------------------------------------------------------------
  * Function:    SetTxPowerLevel8723A()
  *
@@ -795,19 +765,30 @@ static void ccxPowerIndexCheck(struct rtw_adapter *Adapter, u8 channel,
 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 */
+       u8 cckpwr[2], ofdmpwr[2];       /*  [0]:RF-A, [1]:RF-B */
+       int i = channel - 1;
 
        if (pHalData->bTXPowerDataReadFromEEPORM == false)
                return;
 
-       getTxPowerIndex(Adapter, channel, &cckPowerLevel[0],
-                       &ofdmPowerLevel[0]);
+       /*  1. CCK */
+       cckpwr[RF_PATH_A] = pHalData->TxPwrLevelCck[RF_PATH_A][i];
+       cckpwr[RF_PATH_B] = pHalData->TxPwrLevelCck[RF_PATH_B][i];
 
-       ccxPowerIndexCheck(Adapter, channel, &cckPowerLevel[0],
-                          &ofdmPowerLevel[0]);
+       /*  2. OFDM for 1S or 2S */
+       if (GET_RF_TYPE(Adapter) == RF_1T2R ||
+           GET_RF_TYPE(Adapter) == RF_1T1R) {
+               /*  Read HT 40 OFDM TX power */
+               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 */
+               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);
 }
 
 /*-----------------------------------------------------------------------------