staging: r8188eu: ODM_RF_CALIBRATION is always set

The 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.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220122170547.68378-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
index 21ecc90a558cae7c4baf0747820f62ffcb3ae264..5f7a2668cabbb8da13d40f5f82784ad5ed8b272f 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
@@ -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;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index 2f7294f0486d9d9bfbf158698ae680fddc512475..558aa85f1a9f0abd3c5e5422cde33ae1c5bb0a81 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -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;
 

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index ed6f724841d3e006e0475fa847f27125ad950de4..63e0b6725beed2b4f8aa12427d104386f66ecce7 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -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