staging: r8188eu: remove unnecessary if statements
authorMichael Straube <straube.linux@gmail.com>
Sat, 18 Sep 2021 18:18:59 +0000 (20:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Sep 2021 11:41:33 +0000 (13:41 +0200)
(pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) is always false and
(pDM_Odm->SupportICType & ODM_IC_11N_SERIES) is always true since
SupportICType is ODM_RTL8188E in this driver. Remove unnecessary
if statements that check for this.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210918181904.12000-10-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/hal/odm.c

index cb27edf657d9fbe5f6987ea7d60e667c07f693b6..23ef08fc64cd840fa627ed0233cfae9b292f705a 100644 (file)
@@ -163,22 +163,18 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
        odm_DIGInit(pDM_Odm);
        odm_RateAdaptiveMaskInit(pDM_Odm);
 
-       if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) {
-               ;
-       } else if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) {
-               odm_PrimaryCCA_Init(pDM_Odm);    /*  Gary */
-               odm_DynamicBBPowerSavingInit(pDM_Odm);
-               odm_DynamicTxPowerInit(pDM_Odm);
-               odm_TXPowerTrackingInit(pDM_Odm);
-               ODM_EdcaTurboInit(pDM_Odm);
-               ODM_RAInfo_Init_all(pDM_Odm);
-               if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)   ||
-                   (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV) ||
-                   (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))
-                       odm_InitHybridAntDiv(pDM_Odm);
-               else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)
-                       odm_SwAntDivInit(pDM_Odm);
-       }
+       odm_PrimaryCCA_Init(pDM_Odm);    /*  Gary */
+       odm_DynamicBBPowerSavingInit(pDM_Odm);
+       odm_DynamicTxPowerInit(pDM_Odm);
+       odm_TXPowerTrackingInit(pDM_Odm);
+       ODM_EdcaTurboInit(pDM_Odm);
+       ODM_RAInfo_Init_all(pDM_Odm);
+       if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)   ||
+           (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV) ||
+           (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))
+               odm_InitHybridAntDiv(pDM_Odm);
+       else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)
+               odm_SwAntDivInit(pDM_Odm);
 }
 
 /*  2011/09/20 MH This is the entry pointer for all team to execute HW out source DM. */
@@ -218,13 +214,10 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
        else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)
                odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_PEAK);
 
-       if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) {
-               ;
-       } else if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) {
-               ODM_TXPowerTrackingCheck(pDM_Odm);
-               odm_EdcaTurboCheck(pDM_Odm);
-               odm_DynamicTxPower(pDM_Odm);
-       }
+       ODM_TXPowerTrackingCheck(pDM_Odm);
+       odm_EdcaTurboCheck(pDM_Odm);
+       odm_DynamicTxPower(pDM_Odm);
+
        odm_dtc(pDM_Odm);
 }