From: Martin Kaiser Date: Sat, 8 Jan 2022 12:49:48 +0000 (+0100) Subject: staging: r8188eu: ODM_MAC_EDCA_TURBO is always set X-Git-Tag: v6.6.17~7876^2~418 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d04213433ef49c40126dd5ce6f08b1ee5d5bf12b;p=platform%2Fkernel%2Flinux-rpi.git 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 Link: https://lore.kernel.org/r/20220108124959.313215-2-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c index d8fa587..77ece19 100644 --- 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 bd6eb38..5118d0e 100644 --- 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 23a151c..616a862 100644 --- 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),