staging: rtl8188eu: simplify path_adda_on
authorMartin Kaiser <martin@kaiser.cx>
Sun, 25 Jul 2021 15:59:00 +0000 (17:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jul 2021 13:19:28 +0000 (15:19 +0200)
path_adda_on's is2t parameter is always false.
Remove some code that would be called only for is2t == true.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210725155902.32433-16-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/hal/phy.c

index 643d846..a6181b9 100644 (file)
@@ -711,19 +711,13 @@ static void reload_mac_registers(struct adapter *adapt, const u32 *mac_reg,
        usb_write32(adapt, mac_reg[i], backup[i]);
 }
 
-static void path_adda_on(struct adapter *adapt, const u32 *adda_reg,
-                        bool is_path_a_on, bool is2t)
+static void path_adda_on(struct adapter *adapt, const u32 *adda_reg, bool is_path_a_on)
 {
        u32 path_on;
        u32 i;
 
-       if (!is2t) {
-               path_on = 0x0bdb25a0;
-               phy_set_bb_reg(adapt, adda_reg[0], bMaskDWord, 0x0b1b25a0);
-       } else {
-               path_on = is_path_a_on ? 0x04db25a4 : 0x0b1b25a4;
-               phy_set_bb_reg(adapt, adda_reg[0], bMaskDWord, path_on);
-       }
+       path_on = 0x0bdb25a0;
+       phy_set_bb_reg(adapt, adda_reg[0], bMaskDWord, 0x0b1b25a0);
 
        for (i = 1; i < IQK_ADDA_REG_NUM; i++)
                phy_set_bb_reg(adapt, adda_reg[i], bMaskDWord, path_on);
@@ -870,7 +864,7 @@ static void phy_iq_calibrate(struct adapter *adapt, s32 result[][8],
                                    dm_odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM);
        }
 
-       path_adda_on(adapt, adda_reg, true, false);
+       path_adda_on(adapt, adda_reg, true);
        if (t == 0)
                dm_odm->RFCalibrateInfo.bRfPiEnable = (u8)phy_query_bb_reg(adapt, rFPGA0_XA_HSSIParameter1,
                                                                           BIT(8));