staging: r8188eu: ODM_MAC_EDCA_TURBO is always set

The ODM_MAC_EDCA_TURBO flag is always set for chips that are supported by
this driver. 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/20220108124959.313215-2-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 d8fa587ff286a8ac9e61381be6daa1d493c569ac..77ece1950b637dca4e63ec7db1c90dddc95c8320 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -563,9 +563,6 @@ static void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm)
        struct mlme_ext_priv    *pmlmeext = &Adapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &pmlmeext->mlmext_info;
 
-       if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO))
-               return;
-
        if (pregpriv->wifi_spec == 1)
                goto dm_CheckEdcaTurbo_EXIT;
 

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index bd6eb3878060ecb50c921158fb40bd413ac29b62..5118d0e3045b2ab091ebd0414b555a3e6c2b0bca 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -56,7 +56,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
        pdmpriv->InitODMFlag = ODM_BB_FA_CNT |
                                ODM_BB_RSSI_MONITOR |
                                ODM_BB_CCK_PD |
-                               ODM_MAC_EDCA_TURBO |
                                ODM_RF_CALIBRATION |
                                ODM_RF_TX_PWR_TRACK;
        if (hal_data->AntDivCfg)

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 23a151c558dc273060c890a8112ea16a01a0631d..616a862180b25f5604091654ac82a7694fec979a 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -154,9 +154,6 @@ enum odm_ability_def {
        ODM_BB_ANT_DIV                  = BIT(6),
        ODM_BB_PWR_TRA                  = BIT(8),
 
-       /*  MAC DM section BIT 16-23 */
-       ODM_MAC_EDCA_TURBO              = BIT(16),
-
        /*  RF ODM section BIT 24-31 */
        ODM_RF_TX_PWR_TRACK             = BIT(24),
        ODM_RF_CALIBRATION              = BIT(26),