wifi: brcm80211: Remove 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.
Then remove two more functions in phy_n.c that were only used
by the ones just removed.

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-2-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 c3d7aa570b4e204acae90792f9769ed51ceb66df..2dca926acac6b43e47511171c026eb1c6da73502 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -2555,27 +2555,6 @@ end:
        return rssi;
 }
 
-void wlc_phy_freqtrack_start(struct brcms_phy_pub *pih)
-{
-       return;
-}
-
-void wlc_phy_freqtrack_end(struct brcms_phy_pub *pih)
-{
-       return;
-}
-
-void wlc_phy_set_deaf(struct brcms_phy_pub *ppi, bool user_flag)
-{
-       struct brcms_phy *pi;
-       pi = (struct brcms_phy *) ppi;
-
-       if (ISLCNPHY(pi))
-               wlc_lcnphy_deaf_mode(pi, true);
-       else if (ISNPHY(pi))
-               wlc_nphy_deaf_mode(pi, true);
-}
-
 void wlc_phy_watchdog(struct brcms_phy_pub *pih)
 {
        struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
@@ -2636,28 +2615,6 @@ void wlc_phy_watchdog(struct brcms_phy_pub *pih)
        }
 }
 
-void wlc_phy_BSSinit(struct brcms_phy_pub *pih, bool bonlyap, int rssi)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-       uint i;
-       uint k;
-
-       for (i = 0; i < MA_WINDOW_SZ; i++)
-               pi->sh->phy_noise_window[i] = (s8) (rssi & 0xff);
-       if (ISLCNPHY(pi)) {
-               for (i = 0; i < MA_WINDOW_SZ; i++)
-                       pi->sh->phy_noise_window[i] =
-                               PHY_NOISE_FIXED_VAL_LCNPHY;
-       }
-       pi->sh->phy_noise_index = 0;
-
-       for (i = 0; i < PHY_NOISE_WINDOW_SZ; i++) {
-               for (k = WL_ANT_IDX_1; k < WL_ANT_RX_MAX; k++)
-                       pi->nphy_noise_win[k][i] = PHY_NOISE_FIXED_VAL_NPHY;
-       }
-       pi->nphy_noise_index = 0;
-}
-
 void
 wlc_phy_papd_decode_epsilon(u32 epsilon, s32 *eps_real, s32 *eps_imag)
 {
@@ -2812,14 +2769,6 @@ void wlc_phy_stf_chain_set(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain)
        pi->pubpi.phy_corenum = (u8)hweight8(pi->sh->phyrxchain);
 }
 
-void wlc_phy_stf_chain_get(struct brcms_phy_pub *pih, u8 *txchain, u8 *rxchain)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-
-       *txchain = pi->sh->phytxchain;
-       *rxchain = pi->sh->phyrxchain;
-}
-
 u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih)
 {
        s16 nphy_currtemp;
@@ -2852,89 +2801,12 @@ u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih)
        return active_bitmap;
 }
 
-s8 wlc_phy_stf_ssmode_get(struct brcms_phy_pub *pih, u16 chanspec)
-{
-       struct brcms_phy *pi = container_of(pih, struct brcms_phy, pubpi_ro);
-       u8 siso_mcs_id, cdd_mcs_id;
-
-       siso_mcs_id =
-               (CHSPEC_IS40(chanspec)) ? TXP_FIRST_MCS_40_SISO :
-               TXP_FIRST_MCS_20_SISO;
-       cdd_mcs_id =
-               (CHSPEC_IS40(chanspec)) ? TXP_FIRST_MCS_40_CDD :
-               TXP_FIRST_MCS_20_CDD;
-
-       if (pi->tx_power_target[siso_mcs_id] >
-           (pi->tx_power_target[cdd_mcs_id] + 12))
-               return PHY_TXC1_MODE_SISO;
-       else
-               return PHY_TXC1_MODE_CDD;
-}
-
 const u8 *wlc_phy_get_ofdm_rate_lookup(void)
 {
        return ofdm_rate_lookup;
 }
 
-void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode)
-{
-       if ((pi->sh->chip == BCMA_CHIP_ID_BCM4313) &&
-           (pi->sh->boardflags & BFL_FEM)) {
-               if (mode) {
-                       u16 txant = 0;
-                       txant = wlapi_bmac_get_txant(pi->sh->physhim);
-                       if (txant == 1) {
-                               mod_phy_reg(pi, 0x44d, (0x1 << 2), (1) << 2);
-
-                               mod_phy_reg(pi, 0x44c, (0x1 << 2), (1) << 2);
-
-                       }
-
-                       bcma_chipco_gpio_control(&pi->d11core->bus->drv_cc,
-                                                0x0, 0x0);
-                       bcma_chipco_gpio_out(&pi->d11core->bus->drv_cc,
-                                            ~0x40, 0x40);
-                       bcma_chipco_gpio_outen(&pi->d11core->bus->drv_cc,
-                                              ~0x40, 0x40);
-               } else {
-                       mod_phy_reg(pi, 0x44c, (0x1 << 2), (0) << 2);
-
-                       mod_phy_reg(pi, 0x44d, (0x1 << 2), (0) << 2);
-
-                       bcma_chipco_gpio_out(&pi->d11core->bus->drv_cc,
-                                            ~0x40, 0x00);
-                       bcma_chipco_gpio_outen(&pi->d11core->bus->drv_cc,
-                                              ~0x40, 0x00);
-                       bcma_chipco_gpio_control(&pi->d11core->bus->drv_cc,
-                                                0x0, 0x40);
-               }
-       }
-}
-
 void wlc_phy_ldpc_override_set(struct brcms_phy_pub *ppi, bool ldpc)
 {
        return;
 }
-
-void
-wlc_phy_get_pwrdet_offsets(struct brcms_phy *pi, s8 *cckoffset, s8 *ofdmoffset)
-{
-       *cckoffset = 0;
-       *ofdmoffset = 0;
-}
-
-s8 wlc_phy_upd_rssi_offset(struct brcms_phy *pi, s8 rssi, u16 chanspec)
-{
-
-       return rssi;
-}
-
-bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *ppi)
-{
-       struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);
-
-       if (ISNPHY(pi))
-               return wlc_phy_n_txpower_ipa_ison(pi);
-       else
-               return false;
-}

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 1efc92fd167170d5a51411ff3fb09b3e0b96aaeb..8388eea8b17f6ee5f2ff305f89f694aa7bc13d78 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
@@ -194,14 +194,9 @@ void wlc_phy_por_inform(struct brcms_phy_pub *ppi);
 void wlc_phy_noise_sample_intr(struct brcms_phy_pub *ppi);
 bool wlc_phy_bist_check_phy(struct brcms_phy_pub *ppi);
 
-void wlc_phy_set_deaf(struct brcms_phy_pub *ppi, bool user_flag);
-
 void wlc_phy_switch_radio(struct brcms_phy_pub *ppi, bool on);
 void wlc_phy_anacore(struct brcms_phy_pub *ppi, bool on);
 
-
-void wlc_phy_BSSinit(struct brcms_phy_pub *ppi, bool bonlyap, int rssi);
-
 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,
@@ -224,13 +219,10 @@ bool wlc_phy_txpower_hw_ctrl_get(struct brcms_phy_pub *ppi);
 void wlc_phy_txpower_hw_ctrl_set(struct brcms_phy_pub *ppi, bool hwpwrctrl);
 u8 wlc_phy_txpower_get_target_min(struct brcms_phy_pub *ppi);
 u8 wlc_phy_txpower_get_target_max(struct brcms_phy_pub *ppi);
-bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *pih);
 
 void wlc_phy_stf_chain_init(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain);
 void wlc_phy_stf_chain_set(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain);
-void wlc_phy_stf_chain_get(struct brcms_phy_pub *pih, u8 *txchain, u8 *rxchain);
 u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih);
-s8 wlc_phy_stf_ssmode_get(struct brcms_phy_pub *pih, u16 chanspec);
 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);
@@ -257,9 +249,6 @@ void wlc_phy_machwcap_set(struct brcms_phy_pub *ppi, u32 machwcap);
 
 void wlc_phy_runbist_config(struct brcms_phy_pub *ppi, bool start_end);
 
-void wlc_phy_freqtrack_start(struct brcms_phy_pub *ppi);
-void wlc_phy_freqtrack_end(struct brcms_phy_pub *ppi);
-
 const u8 *wlc_phy_get_ofdm_rate_lookup(void);
 
 s8 wlc_phy_get_tx_power_offset_by_mcs(struct brcms_phy_pub *ppi,

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 70a9ec0507172ebf820edd74c339d1ae1bb4d0ec..18028f673574904d17a28afa7564e79ce7c47600 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
@@ -985,7 +985,6 @@ s8 wlc_lcnphy_tempsense_degree(struct brcms_phy *pi, bool mode);
 s8 wlc_lcnphy_vbatsense(struct brcms_phy *pi, bool mode);
 void wlc_phy_carrier_suppress_lcnphy(struct brcms_phy *pi);
 void wlc_lcnphy_crsuprs(struct brcms_phy *pi, int channel);
-void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode);
 void wlc_2064_vco_cal(struct brcms_phy *pi);
 
 void wlc_phy_txpower_recalc_target(struct brcms_phy *pi);
@@ -1031,7 +1030,6 @@ struct phy_iq_est {
 };
 
 void wlc_phy_stay_in_carriersearch_nphy(struct brcms_phy *pi, bool enable);
-void wlc_nphy_deaf_mode(struct brcms_phy *pi, bool mode);
 
 #define wlc_phy_write_table_nphy(pi, pti) \
        wlc_phy_write_table(pi, pti, 0x72, 0x74, 0x73)
@@ -1115,10 +1113,4 @@ int wlc_phy_rssi_compute_nphy(struct brcms_phy *pi, struct d11rxhdr *rxh);
 #define NPHY_TESTPATTERN_BPHY_RFCS  1
 
 void wlc_phy_nphy_tkip_rifs_war(struct brcms_phy *pi, u8 rifs);
-
-void wlc_phy_get_pwrdet_offsets(struct brcms_phy *pi, s8 *cckoffset,
-                               s8 *ofdmoffset);
-s8 wlc_phy_upd_rssi_offset(struct brcms_phy *pi, s8 rssi, u16 chanspec);
-
-bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pih);
 #endif                         /* _BRCM_PHY_INT_H_ */

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
index b679821c7f998c4439fb7b956a6b7c79e9c731b5..b03d5a1f1a936ea332ca79ff91c9a500ae827a4b 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
@@ -19713,11 +19713,6 @@ u8 wlc_phy_rxcore_getstate_nphy(struct brcms_phy_pub *pih)
        return (u8) rxen_bits;
 }
 
-bool wlc_phy_n_txpower_ipa_ison(struct brcms_phy *pi)
-{
-       return PHY_IPA(pi);
-}
-
 void wlc_phy_cal_init_nphy(struct brcms_phy *pi)
 {
 }
@@ -28575,17 +28570,3 @@ void wlc_phy_stay_in_carriersearch_nphy(struct brcms_phy *pi, bool enable)
                }
        }
 }
-
-void wlc_nphy_deaf_mode(struct brcms_phy *pi, bool mode)
-{
-       wlapi_suspend_mac_and_wait(pi->sh->physhim);
-
-       if (mode) {
-               if (pi->nphy_deaf_count == 0)
-                       wlc_phy_stay_in_carriersearch_nphy(pi, true);
-       } else if (pi->nphy_deaf_count > 0) {
-               wlc_phy_stay_in_carriersearch_nphy(pi, false);
-       }
-
-       wlapi_enable_mac(pi->sh->physhim);
-}