staging:r8188eu: remove NumTotalRFPath member of hal_data_8188e structure

NumTotalRFPath is 1 for r8188eu chip.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 84ffc01030e039776eaf98b35428f7acfc4b75bc..8e0e685862344a20f7a15cc67164d653e1051668 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -278,7 +278,6 @@ void rtw_hal_set_bwmode(struct adapter *adapt, enum ht_channel_width bandwidth,
 
 static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)
 {
-       u8 rf_path;
        u32 param1, param2;
        struct hal_data_8188e *hal_data = adapt->HalData;
 
@@ -286,12 +285,10 @@ static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)
 
        param1 = RF_CHNLBW;
        param2 = channel;
-       for (rf_path = 0; rf_path < hal_data->NumTotalRFPath; rf_path++) {
-               hal_data->RfRegChnlVal[rf_path] = (hal_data->RfRegChnlVal[rf_path] &
-                                                 0xfffffc00) | param2;
-               phy_set_rf_reg(adapt, (enum rf_radio_path)rf_path, param1,
-                              bRFRegOffsetMask, hal_data->RfRegChnlVal[rf_path]);
-       }
+       hal_data->RfRegChnlVal[0] = (hal_data->RfRegChnlVal[0] &
+                                         0xfffffc00) | param2;
+       phy_set_rf_reg(adapt, 0, param1,
+                      bRFRegOffsetMask, hal_data->RfRegChnlVal[0]);
 }
 
 void rtw_hal_set_chan(struct adapter *adapt, u8 channel)

diff --git a/drivers/staging/rtl8188eu/hal/rf.c b/drivers/staging/rtl8188eu/hal/rf.c
index eddd075cec27f6e0a175acdfde96e1e4a86d6108..8f8c9de6a9bc4577fa2057a838bdf37693d8380c 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rf.c
+++ b/drivers/staging/rtl8188eu/hal/rf.c
@@ -137,17 +137,15 @@ static void getpowerbase88e(struct adapter *adapt, u8 *pwr_level_ofdm,
                             (powerbase0<<8) | powerbase0;
                *(ofdmbase+i) = powerbase0;
        }
-       for (i = 0; i < adapt->HalData->NumTotalRFPath; i++) {
-               /* Check HT20 to HT40 diff */
-               if (adapt->HalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
-                       powerlevel[i] = pwr_level_bw20[i];
-               else
-                       powerlevel[i] = pwr_level_bw40[i];
-               powerbase1 = powerlevel[i];
-               powerbase1 = (powerbase1<<24) | (powerbase1<<16) |
-                            (powerbase1<<8) | powerbase1;
-               *(mcs_base+i) = powerbase1;
-       }
+       /* Check HT20 to HT40 diff */
+       if (adapt->HalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
+               powerlevel[0] = pwr_level_bw20[0];
+       else
+               powerlevel[0] = pwr_level_bw40[0];
+       powerbase1 = powerlevel[0];
+       powerbase1 = (powerbase1<<24) | (powerbase1<<16) |
+                    (powerbase1<<8) | powerbase1;
+       *mcs_base = powerbase1;
 }
 static void get_rx_power_val_by_reg(struct adapter *adapt, u8 channel,
                                    u8 index, u32 *powerbase0, u32 *powerbase1,

diff --git a/drivers/staging/rtl8188eu/hal/rf_cfg.c b/drivers/staging/rtl8188eu/hal/rf_cfg.c
index dde64417e66a10d890ada7ec570918e1024993d8..9712d7b74345f1167e7c90e64bb06e5883badafe 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rf_cfg.c
+++ b/drivers/staging/rtl8188eu/hal/rf_cfg.c
@@ -230,79 +230,33 @@ static bool rf6052_conf_para(struct adapter *adapt)
 {
        struct hal_data_8188e *hal_data = adapt->HalData;
        u32 u4val = 0;
-       u8 rfpath;
        bool rtstatus = true;
        struct bb_reg_def *pphyreg;
 
-       for (rfpath = 0; rfpath < hal_data->NumTotalRFPath; rfpath++) {
-               pphyreg = &hal_data->PHYRegDef[rfpath];
+       pphyreg = &hal_data->PHYRegDef[RF90_PATH_A];
+       u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs, BRFSI_RFENV);
 
-               switch (rfpath) {
-               case RF90_PATH_A:
-               case RF90_PATH_C:
-                       u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs,
-                                                BRFSI_RFENV);
-                       break;
-               case RF90_PATH_B:
-               case RF90_PATH_D:
-                       u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs,
-                                                BRFSI_RFENV << 16);
-                       break;
-               }
+       phy_set_bb_reg(adapt, pphyreg->rfintfe, BRFSI_RFENV << 16, 0x1);
+       udelay(1);
 
-               phy_set_bb_reg(adapt, pphyreg->rfintfe, BRFSI_RFENV << 16, 0x1);
-               udelay(1);
+       phy_set_bb_reg(adapt, pphyreg->rfintfo, BRFSI_RFENV, 0x1);
+       udelay(1);
 
-               phy_set_bb_reg(adapt, pphyreg->rfintfo, BRFSI_RFENV, 0x1);
-               udelay(1);
+       phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2, B3WIREADDREAALENGTH, 0x0);
+       udelay(1);
 
-               phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2,
-                             B3WIREADDREAALENGTH, 0x0);
-               udelay(1);
+       phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2, B3WIREDATALENGTH, 0x0);
+       udelay(1);
 
-               phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2,
-                              B3WIREDATALENGTH, 0x0);
-               udelay(1);
+       rtstatus = rtl88e_phy_config_rf_with_headerfile(adapt);
 
-               switch (rfpath) {
-               case RF90_PATH_A:
-                       rtstatus = rtl88e_phy_config_rf_with_headerfile(adapt);
-                       break;
-               case RF90_PATH_B:
-                       rtstatus = rtl88e_phy_config_rf_with_headerfile(adapt);
-                       break;
-               case RF90_PATH_C:
-                       break;
-               case RF90_PATH_D:
-                       break;
-               }
-
-               switch (rfpath) {
-               case RF90_PATH_A:
-               case RF90_PATH_C:
-                       phy_set_bb_reg(adapt, pphyreg->rfintfs,
-                                      BRFSI_RFENV, u4val);
-                       break;
-               case RF90_PATH_B:
-               case RF90_PATH_D:
-                       phy_set_bb_reg(adapt, pphyreg->rfintfs,
-                                      BRFSI_RFENV << 16, u4val);
-                       break;
-               }
-
-               if (!rtstatus)
-                       return false;
-       }
+       phy_set_bb_reg(adapt, pphyreg->rfintfs, BRFSI_RFENV, u4val);
 
        return rtstatus;
 }
 
 static bool rtl88e_phy_rf6052_config(struct adapter *adapt)
 {
-       struct hal_data_8188e *hal_data = adapt->HalData;
-
-       hal_data->NumTotalRFPath = 1;
-
        return rf6052_conf_para(adapt);
 }
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 385bc2f56f2f07b6c146e070954f779761353c26..edc6b528a7af4c7b1ecfb78711423e491fcc0870 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -135,7 +135,6 @@ void rtw_hal_read_chip_version(struct adapter *padapter)
        dump_chip_info(ChipVersion);
 
        pHalData->VersionID = ChipVersion;
-       pHalData->NumTotalRFPath = 1;
 }
 
 void rtw_hal_set_odm_var(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
@@ -470,7 +469,7 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
 {
        struct hal_data_8188e *pHalData = padapter->HalData;
        struct txpowerinfo24g pwrInfo24G;
-       u8 rfPath, ch, group;
+       u8 ch, group;
        u8 bIn24G, TxCount;
 
        Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail);
@@ -478,34 +477,32 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
        if (!AutoLoadFail)
                pHalData->bTXPowerDataReadFromEEPORM = true;
 
-       for (rfPath = 0; rfPath < pHalData->NumTotalRFPath; rfPath++) {
-               for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
-                       bIn24G = Hal_GetChnlGroup88E(ch, &group);
-                       if (bIn24G) {
-                               pHalData->Index24G_CCK_Base[rfPath][ch] = pwrInfo24G.IndexCCK_Base[rfPath][group];
-                               if (ch == 14)
-                                       pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][4];
-                               else
-                                       pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group];
-                       }
-                       if (bIn24G) {
-                               DBG_88E("======= Path %d, Channel %d =======\n", rfPath, ch);
-                               DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n", rfPath, ch , pHalData->Index24G_CCK_Base[rfPath][ch]);
-                               DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n", rfPath, ch , pHalData->Index24G_BW40_Base[rfPath][ch]);
-                       }
+       for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
+               bIn24G = Hal_GetChnlGroup88E(ch, &group);
+               if (bIn24G) {
+                       pHalData->Index24G_CCK_Base[0][ch] = pwrInfo24G.IndexCCK_Base[0][group];
+                       if (ch == 14)
+                               pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][4];
+                       else
+                               pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][group];
                }
-               for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                       pHalData->CCK_24G_Diff[rfPath][TxCount] = pwrInfo24G.CCK_Diff[rfPath][TxCount];
-                       pHalData->OFDM_24G_Diff[rfPath][TxCount] = pwrInfo24G.OFDM_Diff[rfPath][TxCount];
-                       pHalData->BW20_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW20_Diff[rfPath][TxCount];
-                       pHalData->BW40_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW40_Diff[rfPath][TxCount];
-                       DBG_88E("======= TxCount %d =======\n", TxCount);
-                       DBG_88E("CCK_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->CCK_24G_Diff[rfPath][TxCount]);
-                       DBG_88E("OFDM_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->OFDM_24G_Diff[rfPath][TxCount]);
-                       DBG_88E("BW20_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW20_24G_Diff[rfPath][TxCount]);
-                       DBG_88E("BW40_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW40_24G_Diff[rfPath][TxCount]);
+               if (bIn24G) {
+                       DBG_88E("======= Path %d, Channel %d =======\n", 0, ch);
+                       DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n", 0, ch , pHalData->Index24G_CCK_Base[0][ch]);
+                       DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n", 0, ch , pHalData->Index24G_BW40_Base[0][ch]);
                }
        }
+       for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
+               pHalData->CCK_24G_Diff[0][TxCount] = pwrInfo24G.CCK_Diff[0][TxCount];
+               pHalData->OFDM_24G_Diff[0][TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
+               pHalData->BW20_24G_Diff[0][TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
+               pHalData->BW40_24G_Diff[0][TxCount] = pwrInfo24G.BW40_Diff[0][TxCount];
+               DBG_88E("======= TxCount %d =======\n", TxCount);
+               DBG_88E("CCK_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->CCK_24G_Diff[0][TxCount]);
+               DBG_88E("OFDM_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->OFDM_24G_Diff[0][TxCount]);
+               DBG_88E("BW20_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->BW20_24G_Diff[0][TxCount]);
+               DBG_88E("BW40_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->BW40_24G_Diff[0][TxCount]);
+       }
 
        /*  2010/10/19 MH Add Regulator recognize for CU. */
        if (!AutoLoadFail) {

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index 226e89ba132de074555d9faef334b9a6d75512d4..9330361da4adf9b838de27bd1c1b3e3b06d323f5 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -200,9 +200,6 @@ struct hal_data_8188e {
 
        u16     BasicRateSet;
 
-       /* rf_ctrl */
-       u8      NumTotalRFPath;
-
        u8      BoardType;
 
        /*  EEPROM setting. */