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 <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220122170547.68378-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 7de0f458d788e9cd110596516ca5fcffc9a4a3dd..9b4b75c225a786850bab7873aa2b876e91d1410b 100644 (file)
--- 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 adf87c1721eea5469fd824c3a647d3de792db1d0..2f7294f0486d9d9bfbf158698ae680fddc512475 100644 (file)
--- 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 50960e7daf1df33c7576f88978fc95fe973a511d..ed6f724841d3e006e0475fa847f27125ad950de4 100644 (file)
--- 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),
 };