staging: r8188eu: remove odm_DynamicBBPowerSaving()
PATCH 1/2 staging: r8188eu: remove odm_DynamicBBPowerSaving()
SupportICType is ODM_RTL8188E in this driver. So function odm_DynamicBBPowerSaving() does nothing, remove it. It is the only user of odm_1R_CCA(), remove that function as well.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/hal/odm.c | 54 ------------------- drivers/staging/r8188eu/include/odm_precomp.h | 2 - 2 files changed, 56 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -54
@@ -205,7 +205,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)odm_RefreshRateAdaptiveMask (pDM_Odm); -odm_DynamicBBPowerSaving (pDM_Odm);if ((pDM_Odm->AntDivType ==CG_TRX_HW_ANTDIV ) || (pDM_Odm->AntDivType ==CGCS_RX_HW_ANTDIV ) || (pDM_Odm->AntDivType ==CG_TRX_SMART_ANTDIV ))
@@ -859,59 +858,6 @@ void odm_DynamicBBPowerSavingInit(struct odm_dm_struct *pDM_Odm) pDM_PSTable->initialize =0 ; } -void odm_DynamicBBPowerSaving (struct odm_dm_struct *pDM_Odm) -{ -if ((pDM_Odm->SupportICType !=ODM_RTL8192C ) && (pDM_Odm->SupportICType !=ODM_RTL8723A )) -return ; -if (!(pDM_Odm->SupportAbility &ODM_BB_PWR_SAVE )) -return ; -if (!(pDM_Odm->SupportPlatform & (ODM_MP |ODM_CE ))) -return ; - -/* 1 2.Power Saving for 92C */ -if ((pDM_Odm->SupportICType ==ODM_RTL8192C ) && (pDM_Odm->RFType ==ODM_2T2R )) { -odm_1R_CCA (pDM_Odm); - }else { -/* 20100628 Joseph: Turn off BB power save for 88CE because it makesthroughput unstable. */ -/* 20100831 Joseph: Turn ON BB power save again after modifying AGC delay from 900ns ot 600ns. */ -/* 1 3.Power Saving for 88C */ -ODM_RF_Saving (pDM_Odm, false); - } -} - -void odm_1R_CCA (struct odm_dm_struct *pDM_Odm) -{ -struct rtl_ps *pDM_PSTable = &pDM_Odm->DM_PSTable; - -if (pDM_Odm->RSSI_Min !=0xFF ) { -if (pDM_PSTable->pre_cca_state ==CCA_2R ) { -if (pDM_Odm->RSSI_Min >=35 ) - pDM_PSTable->cur_cca_state =CCA_1R ; -else - pDM_PSTable->cur_cca_state =CCA_2R ; - }else { -if (pDM_Odm->RSSI_Min <=30 ) - pDM_PSTable->cur_cca_state =CCA_2R ; -else - pDM_PSTable->cur_cca_state =CCA_1R ; - } - }else { - pDM_PSTable->cur_cca_state =CCA_MAX ; - } - -if (pDM_PSTable->pre_cca_state != pDM_PSTable->cur_cca_state) { -if (pDM_PSTable->cur_cca_state ==CCA_1R ) { -if (pDM_Odm->RFType ==ODM_2T2R ) -ODM_SetBBReg (pDM_Odm,0xc04 , bMaskByte0,0x13 ); -else -ODM_SetBBReg (pDM_Odm,0xc04 , bMaskByte0,0x23 ); - }else { -ODM_SetBBReg (pDM_Odm,0xc04 , bMaskByte0,0x33 ); - } - pDM_PSTable->pre_cca_state = pDM_PSTable->cur_cca_state; - } -} -void ODM_RF_Saving (struct odm_dm_struct *pDM_Odm,u8 bForceInNormal) {struct rtl_ps *pDM_PSTable = &pDM_Odm->DM_PSTable;
drivers/staging/r8188eu/include/odm_precomp.h +0 -2
@@ -45,14 +45,12 @@ void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm);void odm_DIG (struct odm_dm_struct *pDM_Odm);void odm_CCKPacketDetectionThresh (struct odm_dm_struct *pDM_Odm);void odm_RefreshRateAdaptiveMaskMP (struct odm_dm_struct *pDM_Odm); -void odm_DynamicBBPowerSaving (struct odm_dm_struct *pDM_Odm);void odm_SwAntDivChkAntSwitch (struct odm_dm_struct *pDM_Odm,u8 Step);void odm_EdcaTurboCheck (struct odm_dm_struct *pDM_Odm);void odm_CommonInfoSelfInit (struct odm_dm_struct *pDM_Odm);void odm_SwAntDivInit (struct odm_dm_struct *pDM_Odm);void odm_RSSIMonitorCheck (struct odm_dm_struct *pDM_Odm);void odm_RefreshRateAdaptiveMask (struct odm_dm_struct *pDM_Odm); -void odm_1R_CCA (struct odm_dm_struct *pDM_Odm);void odm_RefreshRateAdaptiveMaskCE (struct odm_dm_struct *pDM_Odm);void odm_RefreshRateAdaptiveMaskAPADSL (struct odm_dm_struct *pDM_Odm);void odm_RSSIMonitorCheckMP (struct odm_dm_struct *pDM_Odm);
Signature · 1 line
2.33.0
PATCH 2/2 staging: r8188eu: remove odm_GlobalAdapterCheck()
Function odm_GlobalAdapterCheck() is empty, remove it.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/hal/odm.c | 6 ------ drivers/staging/r8188eu/include/odm_precomp.h | 1 - 2 files changed, 7 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -6
@@ -182,7 +182,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)void ODM_DMWatchdog (struct odm_dm_struct *pDM_Odm) {/* 2012.05.03 Luke: For all IC series */ -odm_GlobalAdapterCheck ();odm_CommonInfoSelfUpdate (pDM_Odm);odm_FalseAlarmCounterStatistics (pDM_Odm);odm_RSSIMonitorCheck (pDM_Odm);
@@ -1521,11 +1520,6 @@ u32 ConvertTo_dB(u32 Value)return dB; } -/* 2011/09/22 MH Add for 92D global spin lock utilization. */ -void odm_GlobalAdapterCheck (void ) -{ -}/* odm_GlobalAdapterCheck */ -/* Description: */ /* Set Single/Dual Antenna default setting for products that do not do detection in advance. */ /* Added by Joseph, 2012.03.22 */
drivers/staging/r8188eu/include/odm_precomp.h +0 -1
@@ -39,7 +39,6 @@ void odm_DynamicBBPowerSavingInit(struct odm_dm_struct *pDM_Odm);void odm_TXPowerTrackingInit (struct odm_dm_struct *pDM_Odm);void ODM_EdcaTurboInit (struct odm_dm_struct *pDM_Odm);void odm_SwAntDivInit_NIC (struct odm_dm_struct *pDM_Odm); -void odm_GlobalAdapterCheck (void );void odm_CommonInfoSelfUpdate (struct odm_dm_struct *pDM_Odm);void odm_FalseAlarmCounterStatistics (struct odm_dm_struct *pDM_Odm);void odm_DIG (struct odm_dm_struct *pDM_Odm);
Signature · 1 line
2.33.0