staging: r8188eu: some more odm cleanup
cover staging: r8188eu: some more odm cleanup
Remove some flags in the odm layer which are always set. Remove an unused variable and merge two small functions.
Martin Kaiser (4):
staging: r8188eu: EntryMaxUndecoratedSmoothedPWDB is set but not used
staging: r8188eu: ODM_RF_TX_PWR_TRACK is always set
staging: r8188eu: ODM_RF_CALIBRATION is always set
staging: r8188eu: merge Init_ODM_ComInfo_88E and rtl8188e_init_dm_priv
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 5 --- drivers/staging/r8188eu/hal/odm.c | 8 ----- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 32 ++++--------------- drivers/staging/r8188eu/include/odm.h | 4 --- drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +- 5 files changed, 8 insertions(+), 44 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/4 staging: r8188eu: EntryMaxUndecoratedSmoothedPWDB is set but not used
The variable EntryMaxUndecoratedSmoothedPWDB in struct dm_priv is set but not used. Remove it.
--- drivers/staging/r8188eu/hal/odm.c | 5 ----- drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -5
@@ -494,11 +494,6 @@ static void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm) } } -if (tmpEntryMaxPWDB !=0 )/* If associated entry is found */ - pdmpriv->EntryMaxUndecoratedSmoothedPWDB = tmpEntryMaxPWDB; -else - pdmpriv->EntryMaxUndecoratedSmoothedPWDB =0 ; -if (tmpEntryMinPWDB !=0xff )/* If associated entry is found */ pdmpriv->EntryMinUndecoratedSmoothedPWDB = tmpEntryMinPWDB;else
drivers/staging/r8188eu/include/rtl8188e_dm.h +1 -2
@@ -12,9 +12,8 @@ enum{struct dm_priv {u32 InitODMFlag; -/* Upper and Lower Signal threshold for Rate Adaptive*/ +/* Lower Signal threshold for Rate Adaptive */ int EntryMinUndecoratedSmoothedPWDB; -int EntryMaxUndecoratedSmoothedPWDB;int MinUndecoratedPWDBForDM; };
Signature · 1 line
2.30.2
PATCH 2/4 staging: r8188eu: ODM_RF_TX_PWR_TRACK is always set
In reply to Martin KaiserThe ODM_RF_TX_PWR_TRACK flag is set in Init_ODM_ComInfo_88E directly after the driver is probed and it's never cleared.
Remove the flag and the one place where it's checked.
--- drivers/staging/r8188eu/hal/odm.c | 3 --- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 ++----- drivers/staging/r8188eu/include/odm.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -3
@@ -898,9 +898,6 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm) {struct adapter *Adapter = pDM_Odm->Adapter; -if (!(pDM_Odm->SupportAbility &ODM_RF_TX_PWR_TRACK )) -return ; -if (!pDM_Odm->RFCalibrateInfo.TM_Trigger) {/* at least delay 1 sec */ rtl8188e_PHY_SetRFReg (Adapter,RF_PATH_A ,RF_T_METER_88E ,BIT (17 ) |BIT (16 ),0x03 );
drivers/staging/r8188eu/hal/rtl8188e_dm.c +2 -5
@@ -37,8 +37,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION | -ODM_RF_TX_PWR_TRACK ; + pdmpriv->InitODMFlag =ODM_RF_CALIBRATION ;ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag); }
@@ -53,9 +52,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)struct dm_priv *pdmpriv = &hal_data->dmpriv;int i; - pdmpriv->InitODMFlag =ODM_BB_RSSI_MONITOR | -ODM_RF_CALIBRATION | -ODM_RF_TX_PWR_TRACK ; + pdmpriv->InitODMFlag =ODM_BB_RSSI_MONITOR |ODM_RF_CALIBRATION ;if (hal_data->AntDivCfg) pdmpriv->InitODMFlag |=ODM_BB_ANT_DIV ;
drivers/staging/r8188eu/include/odm.h +0 -1
@@ -153,7 +153,6 @@ enum odm_ability_def {ODM_BB_PWR_TRA =BIT (8 ),/* RF ODM section BIT 24-31 */ -ODM_RF_TX_PWR_TRACK =BIT (24 ), ODM_RF_CALIBRATION = BIT(26), };
Signature · 1 line
2.30.2
PATCH 3/4 staging: r8188eu: ODM_RF_CALIBRATION is always set
In reply to Martin KaiserThe ODM_RF_CALIBRATION flag is set in Init_ODM_ComInfo_88E directly after the driver is probed and it's never cleared.
Remove the flag and the code where it's set or checked.
--- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 5 ----- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 7 +------ drivers/staging/r8188eu/include/odm.h | 3 --- 3 files changed, 1 insertion(+), 14 deletions(-)
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +0 -5
@@ -893,9 +893,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) rOFDM0_XCTxAFE, rOFDM0_XDTxAFE, rOFDM0_RxIQExtAnta}; -if (!(dm_odm->SupportAbility &ODM_RF_CALIBRATION )) -return ; -/* 20120213<Kordan> Turn on when continuous Tx to pass lab testing. (required by Edlu) */ if (singletone || carrier_sup)return ;
@@ -993,8 +990,6 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt)struct hal_data_8188e *pHalData = &adapt->haldata;struct odm_dm_struct *dm_odm = &pHalData->odmpriv; -if (!(dm_odm->SupportAbility &ODM_RF_CALIBRATION )) -return ;/* 20120213<Kordan> Turn on when continuous Tx to pass lab testing. (required by Edlu) */ if (singletone || carrier_sup)return ;
drivers/staging/r8188eu/hal/rtl8188e_dm.c +1 -6
@@ -25,7 +25,6 @@ static void dm_InitGPIOSetting(struct adapter *Adapter)static void Init_ODM_ComInfo_88E (struct adapter *Adapter) {struct hal_data_8188e *hal_data = &Adapter->haldata; -struct dm_priv *pdmpriv = &hal_data->dmpriv;struct odm_dm_struct *dm_odm = &hal_data->odmpriv;/* Init Value */
@@ -36,10 +35,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID));ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); - - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION ; - -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag); }static void Update_ODM_ComInfo_88E (struct adapter *Adapter)
@@ -52,7 +47,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)struct dm_priv *pdmpriv = &hal_data->dmpriv;int i; - pdmpriv->InitODMFlag =ODM_BB_RSSI_MONITOR |ODM_RF_CALIBRATION ; + pdmpriv->InitODMFlag =ODM_BB_RSSI_MONITOR ;if (hal_data->AntDivCfg) pdmpriv->InitODMFlag |=ODM_BB_ANT_DIV ;
drivers/staging/r8188eu/include/odm.h +0 -3
@@ -151,9 +151,6 @@ enum odm_ability_def {ODM_BB_RSSI_MONITOR =BIT (4 ),ODM_BB_ANT_DIV =BIT (6 ), ODM_BB_PWR_TRA = BIT(8), - -/* RF ODM section BIT 24-31 */ - ODM_RF_CALIBRATION = BIT(26), };# define ODM_ITRF_USB 0x2
Signature · 1 line
2.30.2
Re: [PATCH 3/4] staging: r8188eu: ODM_RF_CALIBRATION is always set
drivers/staging/r8188eu/hal/rtl8188e_dm.c static void Init_ODM_ComInfo_88E(struct adapter *Adapter) · line 42
Quoted 8 lines · Martin Kaiser
drivers/staging/r8188eu/hal/rtl8188e_dm.c +0
-4@@ -36,10 +35,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID));ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); - - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION ; - -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag);
Wait, why did you remove the ODM_CmnInfoUpdate()?
Review static void Init_ODM_ComInfo_88E(struct adapter *Adapter) · line 38
Quoted 1 line
(quoted diff) +0
-0}
regards,
dan carpenter
Re: [PATCH 3/4] staging: r8188eu: ODM_RF_CALIBRATION is always set
Hi Dan,
Thus wrote Dan Carpenter ([email protected]):
Quoted 11 lines · Martin Kaiser
drivers/staging/r8188eu/hal/rtl8188e_dm.c static void Init_ODM_ComInfo_88E(struct adapter *Adapter) · line 42
Quoted 8 lines
drivers/staging/r8188eu/hal/rtl8188e_dm.c +0
-4@@ -36,10 +35,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID));ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); - - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION ; - -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag);Wait, why did you remove the
ODM_CmnInfoUpdate()?
I removed the last item that Init_ODM_ComInfo_88E added to pdmpriv->InitODMFlag. Init_ODM_ComInfo_88E does no longer modify pdmpriv->InitODMFlag, there's no need for updating the odm internal status.
Best regards,
Martin
Re: [PATCH 3/4] staging: r8188eu: ODM_RF_CALIBRATION is always set
Quoted 16 lines · Martin Kaiser
Hi Dan,
Thus wrote Dan Carpenter ([email protected]):
Quoted 11 lines · Martin Kaiser
drivers/staging/r8188eu/hal/rtl8188e_dm.c static void Init_ODM_ComInfo_88E(struct adapter *Adapter) · line 42
Quoted 8 lines
drivers/staging/r8188eu/hal/rtl8188e_dm.c +0
-4@@ -36,10 +35,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID));ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); - - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION ; - -ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag);Wait, why did you remove the
ODM_CmnInfoUpdate()?
Quoted 4 lines
I removed the last item that
Init_ODM_ComInfo_88Eadded topdmpriv->InitODMFlag.Init_ODM_ComInfo_88Edoes no longer modifypdmpriv->InitODMFlag, there's no need for updating the odm internal status.
Ah. Okay. Thanks!
regards,
dan carpenter
PATCH 4/4 staging: r8188eu: merge Init_ODM_ComInfo_88E and rtl8188e_init_dm_priv
In reply to Martin Kaiserrtl8188e_init_dm_priv is the only caller of Init_ODM_ComInfo_88E. Merge the two functions.
--- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_dm.c +6 -16
@@ -22,21 +22,6 @@ static void dm_InitGPIOSetting(struct adapter *Adapter)/* */ /* functions */ /* */ -static void Init_ODM_ComInfo_88E (struct adapter *Adapter) -{ -struct hal_data_8188e *hal_data = &Adapter->haldata; -struct odm_dm_struct *dm_odm = &hal_data->odmpriv; - -/* Init Value */ -memset (dm_odm,0 ,sizeof (*dm_odm)); - - dm_odm->Adapter = Adapter; - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID)); - -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); -} -static void Update_ODM_ComInfo_88E (struct adapter *Adapter) {struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
@@ -102,9 +87,14 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter) {struct hal_data_8188e *hal_data = &Adapter->haldata;struct dm_priv *pdmpriv = &hal_data->dmpriv; +struct odm_dm_struct *dm_odm = &hal_data->odmpriv;memset (pdmpriv,0 ,sizeof (struct dm_priv )); -Init_ODM_ComInfo_88E (Adapter); +memset (dm_odm,0 ,sizeof (*dm_odm)); + + dm_odm->Adapter = Adapter; +ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP ,IS_NORMAL_CHIP (hal_data->VersionID)); +ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType); }/* Add new function to reset the state of antenna diversity before link. */
Signature · 1 line
2.30.2