wifi: brcm80211: Remove yet more unused functions

This is a subset of unused functions in bcrmsmac phy_cmn.c,
They're unused since the original 2010
commit a9533e7ea3c4 ("Staging: Add initial release of brcm80211 - Broadcom
802.11n wireless LAN driver.")

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>>
Link: https://patch.msgid.link/20250626140812.56700-4-linux@treblig.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
index 0dbf239400c38b83aa1a1d06ec695511df43dc14..ce6ce2dea39cb9c930b64c65d610e45e9cfe1628 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -127,23 +127,6 @@ void wlc_phyreg_exit(struct brcms_phy_pub *pih)
        wlapi_bmac_ucode_wake_override_phyreg_clear(pi->sh->physhim);
 }
 
-void wlc_radioreg_enter(struct brcms_phy_pub *pih)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-       wlapi_bmac_mctrl(pi->sh->physhim, MCTL_LOCK_RADIO, MCTL_LOCK_RADIO);
-
-       udelay(10);
-}
-
-void wlc_radioreg_exit(struct brcms_phy_pub *pih)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-
-       (void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));
-       pi->phy_wreg = 0;
-       wlapi_bmac_mctrl(pi->sh->physhim, MCTL_LOCK_RADIO, 0);
-}
-
 u16 read_radio_reg(struct brcms_phy *pi, u16 addr)
 {
        u16 data;
@@ -263,11 +246,6 @@ void mod_radio_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)
        write_radio_reg(pi, addr, (rval & ~mask) | (val & mask));
 }
 
-void write_phy_channel_reg(struct brcms_phy *pi, uint val)
-{
-       bcma_write16(pi->d11core, D11REGOFFS(phychannel), val);
-}
-
 u16 read_phy_reg(struct brcms_phy *pi, u16 addr)
 {
        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
@@ -692,18 +670,6 @@ void wlc_phy_por_inform(struct brcms_phy_pub *ppi)
        pi->phy_init_por = true;
 }
 
-void wlc_phy_edcrs_lock(struct brcms_phy_pub *pih, bool lock)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-
-       pi->edcrs_threshold_lock = lock;
-
-       write_phy_reg(pi, 0x22c, 0x46b);
-       write_phy_reg(pi, 0x22d, 0x46b);
-       write_phy_reg(pi, 0x22e, 0x3c0);
-       write_phy_reg(pi, 0x22f, 0x3c0);
-}
-
 void wlc_phy_initcal_enable(struct brcms_phy_pub *pih, bool initcal)
 {
        struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
@@ -1083,20 +1049,6 @@ void wlc_phy_mute_upd(struct brcms_phy_pub *pih, bool mute, u32 flags)
        return;
 }
 
-void wlc_phy_clear_tssi(struct brcms_phy_pub *pih)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-
-       if (ISNPHY(pi)) {
-               return;
-       } else {
-               wlapi_bmac_write_shm(pi->sh->physhim, M_B_TSSI_0, NULL_TSSI_W);
-               wlapi_bmac_write_shm(pi->sh->physhim, M_B_TSSI_1, NULL_TSSI_W);
-               wlapi_bmac_write_shm(pi->sh->physhim, M_G_TSSI_0, NULL_TSSI_W);
-               wlapi_bmac_write_shm(pi->sh->physhim, M_G_TSSI_1, NULL_TSSI_W);
-       }
-}
-
 static bool wlc_phy_cal_txpower_recalc_sw(struct brcms_phy *pi)
 {
        return false;
@@ -1136,13 +1088,6 @@ void wlc_phy_switch_radio(struct brcms_phy_pub *pih, bool on)
        }
 }
 
-u16 wlc_phy_bw_state_get(struct brcms_phy_pub *ppi)
-{
-       struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);
-
-       return pi->bw;
-}
-
 void wlc_phy_bw_state_set(struct brcms_phy_pub *ppi, u16 bw)
 {
        struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);
@@ -1182,36 +1127,6 @@ void wlc_phy_chanspec_set(struct brcms_phy_pub *ppi, u16 chanspec)
 
 }
 
-int wlc_phy_chanspec_freq2bandrange_lpssn(uint freq)
-{
-       int range = -1;
-
-       if (freq < 2500)
-               range = WL_CHAN_FREQ_RANGE_2G;
-       else if (freq <= 5320)
-               range = WL_CHAN_FREQ_RANGE_5GL;
-       else if (freq <= 5700)
-               range = WL_CHAN_FREQ_RANGE_5GM;
-       else
-               range = WL_CHAN_FREQ_RANGE_5GH;
-
-       return range;
-}
-
-int wlc_phy_chanspec_bandrange_get(struct brcms_phy *pi, u16 chanspec)
-{
-       int range = -1;
-       uint channel = CHSPEC_CHANNEL(chanspec);
-       uint freq = wlc_phy_channel2freq(channel);
-
-       if (ISNPHY(pi))
-               range = wlc_phy_get_chan_freq_range_nphy(pi, channel);
-       else if (ISLCNPHY(pi))
-               range = wlc_phy_chanspec_freq2bandrange_lpssn(freq);
-
-       return range;
-}
-
 void wlc_phy_chanspec_ch14_widefilter_set(struct brcms_phy_pub *ppi,
                                          bool wide_filter)
 {
@@ -1254,50 +1169,6 @@ wlc_phy_chanspec_band_validch(struct brcms_phy_pub *ppi, uint band,
        }
 }
 
-u16 wlc_phy_chanspec_band_firstch(struct brcms_phy_pub *ppi, uint band)
-{
-       struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);
-       uint i;
-       uint channel;
-       u16 chspec;
-
-       for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {
-               channel = chan_info_all[i].chan;
-
-               if (ISNPHY(pi) && pi->bw == WL_CHANSPEC_BW_40) {
-                       uint j;
-
-                       for (j = 0; j < ARRAY_SIZE(chan_info_all); j++) {
-                               if (chan_info_all[j].chan ==
-                                   channel + CH_10MHZ_APART)
-                                       break;
-                       }
-
-                       if (j == ARRAY_SIZE(chan_info_all))
-                               continue;
-
-                       channel = upper_20_sb(channel);
-                       chspec =  channel | WL_CHANSPEC_BW_40 |
-                                 WL_CHANSPEC_CTL_SB_LOWER;
-                       if (band == BRCM_BAND_2G)
-                               chspec |= WL_CHANSPEC_BAND_2G;
-                       else
-                               chspec |= WL_CHANSPEC_BAND_5G;
-               } else
-                       chspec = ch20mhz_chspec(channel);
-
-               if ((pi->a_band_high_disable) && (channel >= FIRST_REF5_CHANNUM)
-                   && (channel <= LAST_REF5_CHANNUM))
-                       continue;
-
-               if ((band == BRCM_BAND_2G && channel <= CH_MAX_2G_CHANNEL) ||
-                   (band == BRCM_BAND_5G && channel > CH_MAX_2G_CHANNEL))
-                       return chspec;
-       }
-
-       return (u16) INVCHANSPEC;
-}
-
 int wlc_phy_txpower_get(struct brcms_phy_pub *ppi, uint *qdbm, bool *override)
 {
        struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
index 1dbec80194a77ee6ed96cd9245660137c3b04683..cab08f0669d1429f3aabcdf27da1648189d3963e 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
@@ -186,7 +186,6 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init);
 void wlc_phy_chanspec_set(struct brcms_phy_pub *ppi, u16 chanspec);
 u16 wlc_phy_chanspec_get(struct brcms_phy_pub *ppi);
 void wlc_phy_chanspec_radio_set(struct brcms_phy_pub *ppi, u16 newch);
-u16 wlc_phy_bw_state_get(struct brcms_phy_pub *ppi);
 void wlc_phy_bw_state_set(struct brcms_phy_pub *ppi, u16 bw);
 
 int wlc_phy_rssi_compute(struct brcms_phy_pub *pih, struct d11rxhdr *rxh);
@@ -201,7 +200,6 @@ void wlc_phy_chanspec_ch14_widefilter_set(struct brcms_phy_pub *ppi,
                                          bool wide_filter);
 void wlc_phy_chanspec_band_validch(struct brcms_phy_pub *ppi, uint band,
                                   struct brcms_chanvec *channels);
-u16 wlc_phy_chanspec_band_firstch(struct brcms_phy_pub *ppi, uint band);
 
 void wlc_phy_txpower_sromlimit(struct brcms_phy_pub *ppi, uint chan, u8 *_min_,
                               u8 *_max_, int rate);
@@ -219,11 +217,9 @@ u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih);
 void wlc_phy_ldpc_override_set(struct brcms_phy_pub *ppi, bool val);
 
 void wlc_phy_cal_perical(struct brcms_phy_pub *ppi, u8 reason);
-void wlc_phy_edcrs_lock(struct brcms_phy_pub *pih, bool lock);
 void wlc_phy_cal_papd_recal(struct brcms_phy_pub *ppi);
 
 void wlc_phy_ant_rxdiv_set(struct brcms_phy_pub *ppi, u8 val);
-void wlc_phy_clear_tssi(struct brcms_phy_pub *ppi);
 void wlc_phy_hold_upd(struct brcms_phy_pub *ppi, u32 id, bool val);
 void wlc_phy_mute_upd(struct brcms_phy_pub *ppi, bool val, u32 flags);
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
index 18028f673574904d17a28afa7564e79ce7c47600..4e80f4d2794904aee9abdc3d6fe50aa3692b52cf 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
@@ -908,8 +908,6 @@ void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val);
 
 void wlc_phyreg_enter(struct brcms_phy_pub *pih);
 void wlc_phyreg_exit(struct brcms_phy_pub *pih);
-void wlc_radioreg_enter(struct brcms_phy_pub *pih);
-void wlc_radioreg_exit(struct brcms_phy_pub *pih);
 
 void wlc_phy_read_table(struct brcms_phy *pi,
                        const struct phytbl_info *ptbl_info,
@@ -921,7 +919,6 @@ void wlc_phy_table_addr(struct brcms_phy *pi, uint tbl_id, uint tbl_offset,
                        u16 tblAddr, u16 tblDataHi, u16 tblDataLo);
 void wlc_phy_table_data_write(struct brcms_phy *pi, uint width, u32 val);
 
-void write_phy_channel_reg(struct brcms_phy *pi, uint val);
 void wlc_phy_txpower_update_shm(struct brcms_phy *pi);
 
 u8 wlc_phy_nbits(s32 value);