staging: r8188eu: remove some unused code
cover staging: r8188eu: remove some unused code
RTL8188EU chips are 1T1R. This set removes some code that is valid only for 1T2R and 2T2R chips.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (4):
staging: r8188eu: remove IS_1T1R, IS_1T2R, IS_2T2R macros
staging: r8188eu: remove if test that is always true
staging: r8188eu: remove NumTotalRFPath from struct hal_data_8188e
staging: r8188eu: remove switches from phy_RF6052_Config_ParaFile()
drivers/staging/r8188eu/hal/hal_com.c | 10 +- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 60 ++++----- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 5 +- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 125 ++++++------------ drivers/staging/r8188eu/include/HalVerDef.h | 9 -- .../staging/r8188eu/include/rtl8188e_hal.h | 1 - 7 files changed, 74 insertions(+), 144 deletions(-)
Signature · 1 line
2.33.0
PATCH 1/4 staging: r8188eu: remove IS_1T1R, IS_1T2R, IS_2T2R macros
In this driver RFType is RF_TYPE_1T1R, so only the macro IS_1T1R returns true. Remove the macros and adjust related code accordingly.
--- drivers/staging/r8188eu/hal/hal_com.c | 10 +--------- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 12 ++---------- drivers/staging/r8188eu/include/HalVerDef.h | 9 --------- 3 files changed, 3 insertions(+), 28 deletions(-)
drivers/staging/r8188eu/hal/hal_com.c +1 -9
@@ -34,15 +34,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers) cnt +=sprintf ((buf + cnt),"UNKNOWN_CUT(%d)_" , chip_vers.CUTVersion); -if (IS_1T1R (chip_vers)) - cnt +=sprintf ((buf + cnt),"1T1R_" ); -else if (IS_1T2R (chip_vers)) - cnt +=sprintf ((buf + cnt),"1T2R_" ); -else if (IS_2T2R (chip_vers)) - cnt +=sprintf ((buf + cnt),"2T2R_" ); -else - cnt +=sprintf ((buf + cnt),"UNKNOWN_RFTYPE(%d)_" , - chip_vers.RFType); + cnt +=sprintf ((buf + cnt),"1T1R_" ); cnt +=sprintf ((buf + cnt),"RomVer(%d)\n" , chip_vers.ROMVer);
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +2 -10
@@ -1690,16 +1690,8 @@ void rtl8188e_read_chip_version(struct adapter *padapter) pHalData->VersionID = ChipVersion; -if (IS_1T2R (ChipVersion)) { - pHalData->rf_type =RF_1T2R ; - pHalData->NumTotalRFPath =2 ; - }else if (IS_2T2R (ChipVersion)) { - pHalData->rf_type =RF_2T2R ; - pHalData->NumTotalRFPath =2 ; - }else { - pHalData->rf_type =RF_1T1R ; - pHalData->NumTotalRFPath =1 ; - } + pHalData->rf_type =RF_1T1R ; + pHalData->NumTotalRFPath =1 ;MSG_88E ("RF_Type is %x!!\n" , pHalData->rf_type); }
drivers/staging/r8188eu/include/HalVerDef.h +0 -9
@@ -45,7 +45,6 @@ struct HAL_VERSION {/* Get element */ #define GET_CVID_CHIP_TYPE (version) (((version).ChipType)) -#define GET_CVID_RF_TYPE (version) (((version).RFType))#define GET_CVID_MANUFACTUER (version) (((version).VendorType))#define GET_CVID_CUT_VERSION (version) (((version).CUTVersion))#define GET_CVID_ROM_VERSION (version) (((version).ROMVer) & ROM_VERSION_MASK)
@@ -77,12 +76,4 @@ struct HAL_VERSION {#define IS_CHIP_VENDOR_UMC (version) \ ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? true : false) -/* HAL_RF_TYPE_E */ -#define IS_1T1R (version) \ - ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T1R) ? true : false) -#define IS_1T2R (version) \ - ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false) -#define IS_2T2R (version) \ - ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false) -#endif
Signature · 1 line
2.33.0
PATCH 2/4 staging: r8188eu: remove if test that is always true
In reply to Michael StraubeThe test "if (pHalData->rf_type == RF_1T1R)" is always true in this driver. Remove the test and the dead else arm.
--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +1 -8
@@ -533,14 +533,7 @@ int PHY_RF6052_Config8188E(struct adapter *Adapter)struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);int rtStatus = _SUCCESS; -/* */ -/* Initialize general global value */ -/* */ -/* TODO: Extend RF_PATH_C and RF_PATH_D in the future */ -if (pHalData->rf_type ==RF_1T1R ) - pHalData->NumTotalRFPath =1 ; -else - pHalData->NumTotalRFPath =2 ; + pHalData->NumTotalRFPath =1 ;/* */ /* Config BB and RF */
Signature · 1 line
2.33.0
PATCH 3/4 staging: r8188eu: remove NumTotalRFPath from struct hal_data_8188e
In reply to Michael StraubeNumTotalRFPath is 1 in this driver and it is only used as exit condition in for loops. Since NumTotalRFPath is always 1, all the loops have only a single iteration. So we can remove the for loops and the NumTotalRFPath variable.
--- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 50 +++---- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 5 +- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 141 +++++++++--------- .../staging/r8188eu/include/rtl8188e_hal.h | 1 - 5 files changed, 97 insertions(+), 108 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +24 -26
@@ -1691,7 +1691,6 @@ void rtl8188e_read_chip_version(struct adapter *padapter) pHalData->VersionID = ChipVersion; pHalData->rf_type =RF_1T1R ; - pHalData->NumTotalRFPath =1 ;MSG_88E ("RF_Type is %x!!\n" , pHalData->rf_type); }
@@ -1999,7 +1998,8 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto {struct hal_data_8188e *pHalData =GET_HAL_DATA (padapter);struct txpowerinfo24g pwrInfo24G; -u8 rfPath, ch, group; +u8 rfPath =0 ; +u8 ch, group;u8 TxCount;Hal_ReadPowerValueFromPROM_8188E (&pwrInfo24G, PROMContent, AutoLoadFail);
@@ -2007,31 +2007,29 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Autoif (!AutoLoadFail) pHalData->bTXPowerDataReadFromEEPORM = true; -for (rfPath =0 ; rfPath < pHalData->NumTotalRFPath; rfPath++) { -for (ch =0 ; ch <CHANNEL_MAX_NUMBER ; ch++) { -hal_get_chnl_group_88e (ch, &group); +for (ch =0 ; ch <CHANNEL_MAX_NUMBER ; ch++) { +hal_get_chnl_group_88e (ch, &group); - 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]; - -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 (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]); - } + 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]; + +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 (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]); }/* 2010/10/19 MH Add Regulator recognize for CU. */
drivers/staging/r8188eu/hal/rtl8188e_mp.c +2 -3
@@ -143,12 +143,11 @@ void Hal_SetChannel(struct adapter *pAdapter)struct hal_data_8188e *pHalData =GET_HAL_DATA (pAdapter);struct mp_priv *pmp = &pAdapter->mppriv;struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv; -u8 eRFPath; +u8 eRFPath =0 ;u8 channel = pmp->channel;/* set RF channel register */ -for (eRFPath =0 ; eRFPath < pHalData->NumTotalRFPath; eRFPath++) -_write_rfreg (pAdapter, eRFPath,ODM_CHANNEL ,0x3FF , channel); +_write_rfreg (pAdapter, eRFPath,ODM_CHANNEL ,0x3FF , channel);Hal_mpt_SwitchRfSetting (pAdapter);SelectChannel (pAdapter, channel);
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +3 -5
@@ -863,7 +863,7 @@ void PHY_SetBWMode8188E(struct adapter *Adapter, enum ht_channel_width Bandwidthstatic void _PHY_SwChnl8192C (struct adapter *Adapter,u8 channel) { -u8 eRFPath; +u8 eRFPath =0 ;u32 param1, param2;struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);
@@ -876,10 +876,8 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)/* s2. RF dependent command - CmdID_RF_WriteReg, param1=RF_CHNLBW, param2=channel */ param1 =RF_CHNLBW ; param2 = channel; -for (eRFPath =0 ; eRFPath < pHalData->NumTotalRFPath; eRFPath++) { - pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] &0xfffffc00 ) | param2); -PHY_SetRFReg (Adapter, (enum rf_radio_path )eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); - } + pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] &0xfffffc00 ) | param2); +PHY_SetRFReg (Adapter, (enum rf_radio_path )eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]); }void PHY_SwChnl8188E (struct adapter *Adapter,u8 channel)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +68 -73
166 lines not on this page · raw message
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
@@ -228,7 +228,6 @@ struct hal_data_8188e {/* rf_ctrl */ u8 rf_chip;u8 rf_type; -u8 NumTotalRFPath;u8 BoardType;
Signature · 1 line
2.33.0
PATCH 4/4 staging: r8188eu: remove switches from phy_RF6052_Config_ParaFile()
In reply to Michael StraubeIn function phy_RF6052_Config_ParaFile() the variable eRFPath is always 0 and RF_PATH_A = 0 in this driver. So we can remove the 'switch (eRFPath)' statements and just keep the code from the RF_PATH_A cases.
--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 39 +++---------------- 1 file changed, 6 insertions(+), 33 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +6 -33
@@ -466,16 +466,8 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) pPhyReg = &pHalData->PHYRegDef[eRFPath];/*----Store original RFENV control type----*/ -switch (eRFPath) { -case RF_PATH_A : -case RF_PATH_C : - u4RegValue =PHY_QueryBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV); -break ; -case RF_PATH_B : -case RF_PATH_D : - u4RegValue =PHY_QueryBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV <<16 ); -break ; - } + u4RegValue =PHY_QueryBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV); +/*----Set RF_ENV enable----*/ PHY_SetBBReg (Adapter, pPhyReg->rfintfe, bRFSI_RFENV <<16 ,0x1 );udelay (1 );/* PlatformStallExecution(1); */
@@ -492,31 +484,12 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)udelay (1 );/* PlatformStallExecution(1); */ /*----Initialize RF fom connfiguration file----*/ -switch (eRFPath) { -case RF_PATH_A : -if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile (&pHalData->odmpriv, (enum rf_radio_path )eRFPath, (enum rf_radio_path )eRFPath)) - rtStatus = _FAIL; -break ; -case RF_PATH_B :if (HAL_STATUS_FAILURE ==ODM_ConfigRFWithHeaderFile (&pHalData->odmpriv, (enum rf_radio_path )eRFPath, (enum rf_radio_path )eRFPath)) - rtStatus = _FAIL; -break ; -case RF_PATH_C : -break ; -case RF_PATH_D : -break ; - } + rtStatus = _FAIL; +/*----Restore RFENV control type----*/ ; -switch (eRFPath) { -case RF_PATH_A : -case RF_PATH_C : -PHY_SetBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); -break ; -case RF_PATH_B : -case RF_PATH_D : -PHY_SetBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV <<16 , u4RegValue); -break ; - } +PHY_SetBBReg (Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); +if (rtStatus != _SUCCESS) goto phy_RF6052_Config_ParaFile_Fail;
Signature · 1 line
2.33.0