]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: brcmsmac: phy_lcn: Remove dead code in wlc_lcnphy_radio_2064_channel_tune_4313()
authorChelsy Ratnawat <chelsyratnawat2001@gmail.com>
Fri, 3 Apr 2026 19:33:24 +0000 (12:33 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 28 Apr 2026 08:43:27 +0000 (10:43 +0200)
The variable rfpll_doubler is initialized to 0 and then unconditionally
set to 1 on the very next line, making the subsequent check for
!rfpll_doubler always evaluate to false. This results in logically
dead code that has never been executed.

Remove the unused variable, the unreachable conditional branch, and
simplify the fpfd calculation to directly use the PLL doubler values.

Signed-off-by: Chelsy Ratnawat <chelsyratnawat2001@gmail.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://patch.msgid.link/20260403193324.141753-1-chelsyratnawat2001@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c

index 8cec5ad79fdaff7b1b3baf3350de1227d15880e7..d65a68045ca82766d7bcad817a8d98650d506de0 100644 (file)
@@ -1607,7 +1607,6 @@ wlc_lcnphy_radio_2064_channel_tune_4313(struct brcms_phy *pi, u8 channel)
 {
        uint i;
        const struct chan_info_2064_lcnphy *ci;
-       u8 rfpll_doubler = 0;
        u8 pll_pwrup, pll_pwrup_ovr;
        s32 qFcal;
        u8 d15, d16, f16, e44, e45;
@@ -1618,18 +1617,12 @@ wlc_lcnphy_radio_2064_channel_tune_4313(struct brcms_phy *pi, u8 channel)
        u16 g30, d28;
 
        ci = &chan_info_2064_lcnphy[0];
-       rfpll_doubler = 1;
 
        mod_radio_reg(pi, RADIO_2064_REG09D, 0x4, 0x1 << 2);
 
        write_radio_reg(pi, RADIO_2064_REG09E, 0xf);
-       if (!rfpll_doubler) {
-               loop_bw = PLL_2064_LOOP_BW;
-               d30 = PLL_2064_D30;
-       } else {
-               loop_bw = PLL_2064_LOOP_BW_DOUBLER;
-               d30 = PLL_2064_D30_DOUBLER;
-       }
+       loop_bw = PLL_2064_LOOP_BW_DOUBLER;
+       d30 = PLL_2064_D30_DOUBLER;
 
        if (CHSPEC_IS2G(pi->radio_chanspec)) {
                for (i = 0; i < ARRAY_SIZE(chan_info_2064_lcnphy); i++)
@@ -1669,7 +1662,7 @@ wlc_lcnphy_radio_2064_channel_tune_4313(struct brcms_phy *pi, u8 channel)
        e44 = 0;
        e45 = 0;
 
-       fpfd = rfpll_doubler ? (pi->xtalfreq << 1) : (pi->xtalfreq);
+       fpfd = pi->xtalfreq << 1;
        if (pi->xtalfreq > 26000000)
                e44 = 1;
        if (pi->xtalfreq > 52000000)