From 706125892924718f43ac90fcaa2118cce86e1318 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sat, 22 Jan 2022 18:05:45 +0100 Subject: [PATCH] staging: r8188eu: ODM_RF_TX_PWR_TRACK is always set The 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. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20220122170547.68378-3-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- 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(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c index 7de0f45..9b4b75c 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -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); diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c index adf87c1..2f7294f 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -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; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h index 50960e7..ed6f724 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -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), }; -- 2.7.4