]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: brcmsmac: phy: Remove unreachable error handling code
authorIngyu Jang <ingyujang25@korea.ac.kr>
Sat, 31 Jan 2026 17:23:55 +0000 (02:23 +0900)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 3 Feb 2026 12:11:12 +0000 (13:11 +0100)
wlc_phy_txpwr_srom_read_lcnphy() in wlc_phy_attach_lcnphy() always
returns true, making the error handling code unreachable. Change the
function's return type to void and remove the dead code, similar to
the cleanup done for wlc_phy_txpwr_srom_read_nphy() in commit
47f0e32ffe4e ("wifi: brcmsmac: phy: Remove unreachable code").

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://patch.msgid.link/20260131172355.3367673-1-ingyujang25@korea.ac.kr
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c

index b4bba67a45ec365c0e55e9c01aa6226aa728bfcb..5258681218ea92603e90740850a20a6bff6d7015 100644 (file)
@@ -4790,7 +4790,7 @@ void wlc_phy_init_lcnphy(struct brcms_phy *pi)
        wlc_lcnphy_calib_modes(pi, PHY_PERICAL_PHYINIT);
 }
 
-static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
+static void wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 {
        s8 txpwr = 0;
        int i;
@@ -4879,8 +4879,6 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
                                sprom->ant_available_bg);
        }
        pi_lcn->lcnphy_cck_dig_filt_type = -1;
-
-       return true;
 }
 
 void wlc_2064_vco_cal(struct brcms_phy *pi)
@@ -4992,10 +4990,7 @@ bool wlc_phy_attach_lcnphy(struct brcms_phy *pi)
        pi->pi_fptr.radioloftget = wlc_lcnphy_get_radio_loft;
        pi->pi_fptr.detach = wlc_phy_detach_lcnphy;
 
-       if (!wlc_phy_txpwr_srom_read_lcnphy(pi)) {
-               kfree(pi->u.pi_lcnphy);
-               return false;
-       }
+       wlc_phy_txpwr_srom_read_lcnphy(pi);
 
        if (LCNREV_IS(pi->pubpi.phy_rev, 1)) {
                if (pi_lcn->lcnphy_tempsense_option == 3) {