staging: r8188eu: remove ODM_CmnInfoPtrArrayHook function
PATCH 3/3 staging: r8188eu: remove ODM_CmnInfoPtrArrayHook function
This function used once, and does not improve code readability.
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/hal/odm.c | 67 ----------------------------- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 37 ++++++++-------- 2 files changed, 20 insertions(+), 84 deletions(-)
drivers/staging/rtl8188eu/hal/odm.c +0 -67
@@ -226,73 +226,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)odm_EdcaTurboCheck (pDM_Odm); } -/* Init /.. Fixed HW value. Only init time. */ -void ODM_CmnInfoInit (struct odm_dm_struct *pDM_Odm,enum odm_common_info_def CmnInfo,u32 Value) -{ -/* This section is used for init value */ -switch (CmnInfo) { -/* Fixed ODM value. */ -case ODM_CMNINFO_ABILITY : - pDM_Odm->SupportAbility = (u32 )Value; -break ; -case ODM_CMNINFO_PLATFORM : - pDM_Odm->SupportPlatform = (u8 )Value; -break ; -case ODM_CMNINFO_INTERFACE : - pDM_Odm->SupportInterface = (u8 )Value; -break ; -case ODM_CMNINFO_MP_TEST_CHIP : - pDM_Odm->bIsMPChip = (u8 )Value; -break ; -case ODM_CMNINFO_IC_TYPE : - pDM_Odm->SupportICType = Value; -break ; -case ODM_CMNINFO_CUT_VER : - pDM_Odm->CutVersion = (u8 )Value; -break ; -case ODM_CMNINFO_RF_TYPE : - pDM_Odm->RFType = (u8 )Value; -break ; -case ODM_CMNINFO_RF_ANTENNA_TYPE : - pDM_Odm->AntDivType = (u8 )Value; -break ; -case ODM_CMNINFO_BOARD_TYPE : - pDM_Odm->BoardType = (u8 )Value; -break ; -case ODM_CMNINFO_EXT_LNA : - pDM_Odm->ExtLNA = (u8 )Value; -break ; -case ODM_CMNINFO_EXT_PA : - pDM_Odm->ExtPA = (u8 )Value; -break ; -case ODM_CMNINFO_EXT_TRSW : - pDM_Odm->ExtTRSW = (u8 )Value; -break ; -case ODM_CMNINFO_PATCH_ID : - pDM_Odm->PatchID = (u8 )Value; -break ; -case ODM_CMNINFO_BINHCT_TEST : - pDM_Odm->bInHctTest = (bool )Value; -break ; -case ODM_CMNINFO_BWIFI_TEST : - pDM_Odm->bWIFITest = (bool )Value; -break ; -case ODM_CMNINFO_SMART_CONCURRENT : - pDM_Odm->bDualMacSmartConcurrent = (bool )Value; -break ; -/* To remove the compiler warning, must add an empty default statement to handle the other values. */ -default : -/* do nothing */ -break ; - } - -/* Tx power tracking BB swing table. */ -/* The base index = 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB */ - pDM_Odm->BbSwingIdxOfdm =12 ;/* Set defalut value as index 12. */ - pDM_Odm->BbSwingIdxOfdmCurrent =12 ; - pDM_Odm->BbSwingFlagOfdm = false; -} -void ODM_CmnInfoPtrArrayHook (struct odm_dm_struct *pDM_Odm,enum odm_common_info_def CmnInfo,u16 Index,void *pValue) {/* Hook call by reference pointer. */
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +20 -17
@@ -45,26 +45,17 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter);struct dm_priv *pdmpriv = &hal_data->dmpriv;struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); -u8 cut_ver;/* Init Value */ memset (dm_odm,0 ,sizeof (*dm_odm)); dm_odm->Adapter = Adapter; - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_PLATFORM ,ODM_CE ); - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_IC_TYPE ,ODM_RTL8188E ); - - cut_ver =ODM_CUT_A ; - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_CUT_VER , cut_ver); - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP , hal_data->VersionID.ChipType ==NORMAL_CHIP ? true : false); - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_PATCH_ID , hal_data->CustomerID); -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_BWIFI_TEST , Adapter->registrypriv.wifi_spec); - + dm_odm->SupportPlatform =ODM_CE ; + dm_odm->SupportICType =ODM_RTL8188E ; + dm_odm->CutVersion =ODM_CUT_A ; + dm_odm->bIsMPChip = hal_data->VersionID.ChipType ==NORMAL_CHIP ; + dm_odm->PatchID = hal_data->CustomerID; + dm_odm->bWIFITest = Adapter->registrypriv.wifi_spec;if (hal_data->rf_type ==RF_1T1R ) dm_odm->RFType =ODM_1T1R ;
@@ -73,7 +64,13 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)else if (hal_data->rf_type ==RF_1T2R ) dm_odm->RFType =ODM_1T2R ; -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); + dm_odm->AntDivType = hal_data->TRxAntDivType; + +/* Tx power tracking BB swing table. */ +/* The base index = 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB */ + dm_odm->BbSwingIdxOfdm =12 ;/* Set defalut value as index 12. */ + dm_odm->BbSwingIdxOfdmCurrent =12 ; + dm_odm->BbSwingFlagOfdm = false; pdmpriv->InitODMFlag =ODM_RF_CALIBRATION |ODM_RF_TX_PWR_TRACK ;
@@ -122,7 +119,13 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter) dm_odm->mp_mode = &Adapter->registrypriv.mp_mode; dm_odm->pbScanInProcess = (bool *)&pmlmepriv->bScanInProcess; dm_odm->pbPowerSaving = (bool *)&pwrctrlpriv->bpower_saving; -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); + dm_odm->AntDivType = hal_data->TRxAntDivType; + +/* Tx power tracking BB swing table. */ +/* The base index = 12. +((12-n)/2)dB 13~?? = decrease tx pwr by -((n-12)/2)dB */ + dm_odm->BbSwingIdxOfdm =12 ;/* Set defalut value as index 12. */ + dm_odm->BbSwingIdxOfdmCurrent =12 ; + dm_odm->BbSwingFlagOfdm = false;for (i =0 ; i <NUM_STA ; i++)ODM_CmnInfoPtrArrayHook (dm_odm,ODM_CMNINFO_STA_STATUS , i,NULL );
Signature · 1 line
2.7.3