staging: rtl8723bs: remove if-else blocks left empty by ODM_RT_TRACE deletion

remove if-else blocks left empty by ODM_RT_TRACE deletion.
remove unused variables to suppress compiler warnings.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/0e1196ebf56787f62dcbfbcba1fcbc2ed37a65ce.1619794331.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
index 2e10817..b8e385f 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
@@ -118,9 +118,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 
        /* 4 3. Initialize ThermalValues of RFCalibrateInfo */
 
-       if (pDM_Odm->RFCalibrateInfo.bReloadtxpowerindex)
-               {}
-
        /* 4 4. Calculate average thermal meter */
 
        pDM_Odm->RFCalibrateInfo.ThermalValue_AVG[pDM_Odm->RFCalibrateInfo.ThermalValue_AVG_index] = ThermalValue;
@@ -273,16 +270,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
                /*  to increase TX power. Otherwise, EVM will be bad. */
                /*  */
                /*  2012/04/25 MH Add for tx power tracking to set tx power in tx agc for 88E. */
-               if (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue) {
-                       if (c.RfPathCount > 1)
-                               {}
-
-               } else if (ThermalValue < pDM_Odm->RFCalibrateInfo.ThermalValue) { /*  Low temperature */
-
-                       if (c.RfPathCount > 1)
-                               {}
-
-               }
 
                if (ThermalValue > pHalData->EEPROMThermalMeter) {
                        for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 471418f..858aafc 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -689,8 +689,7 @@ static u8 phy_PathA_RxIQK8723B(
                (tmp < 0xf)
        )
                result |= 0x02;
-       else                                                    /* if Tx not OK, ignore Rx */
-               {}
+
        return result;
 }
 
@@ -988,8 +987,6 @@ static u8 phy_PathB_RxIQK8723B(struct adapter *padapter, bool configPathB)
                (tmp < 0xf)
        )
                result |= 0x02;
-       else
-               {}
 
        return result;
 }
@@ -1500,7 +1497,6 @@ static void phy_IQCalibrate_8723B(
                                result[t][2] = (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord)&0x3FF0000)>>16;
                                result[t][3] = (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord)&0x3FF0000)>>16;
                        break;
-               } else {
                }
        }
 
@@ -1533,13 +1529,10 @@ static void phy_IQCalibrate_8723B(
                                result[t][6] = (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_Before_IQK_A_2, bMaskDWord)&0x3FF0000)>>16;
                                result[t][7] = (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_After_IQK_A_2, bMaskDWord)&0x3FF0000)>>16;
                                break;
-                       } else {
                        }
                }
 
 /* Allen end */
-               if (0x00 == PathBOK) {
-               }
        }
 
        /* Back to BB mode, load original value */

diff --git a/drivers/staging/rtl8723bs/hal/odm_PathDiv.c b/drivers/staging/rtl8723bs/hal/odm_PathDiv.c
index cfcbc37..bedce2c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_PathDiv.c
+++ b/drivers/staging/rtl8723bs/hal/odm_PathDiv.c
@@ -9,16 +9,8 @@
 
 void odm_PathDiversityInit(void *pDM_VOID)
 {
-       struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;
-
-       if (!(pDM_Odm->SupportAbility & ODM_BB_PATH_DIV))
-               {}
 }
 
 void odm_PathDiversity(void *pDM_VOID)
 {
-       struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;
-
-       if (!(pDM_Odm->SupportAbility & ODM_BB_PATH_DIV))
-               {}
 }