Commit dceb807b authored by Lee Jones's avatar Lee Jones Committed by Kalle Valo
Browse files

brcmsmac: main: Remove a bunch of unused variables 



Fixes the following W=1 kernel build warning(s):

 from drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:27:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_c_dotxstatus’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:845:6: warning: variable ‘mcl’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_b_phy_reset’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:1779:7: warning: variable ‘phy_in_reset’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_ucode_download’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:2273:23: warning: variable ‘wlc’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_b_coreinit’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:3176:6: warning: variable ‘sflags’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_c_set_chanspec’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:3902:7: warning: variable ‘switchband’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_c_down’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:5182:7: warning: variable ‘dev_gone’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_c_ofdm_rateset_war’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:5393:5: warning: variable ‘r’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘mac80211_wlc_set_nrate’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:5876:6: warning: variable ‘bcmerror’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function ‘brcms_c_d11hdrs_mac80211’:
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:6213:7: warning: variable ‘short_preamble’ set but not used [-Wunused-but-set-variable]

Cc: Arend van Spriel <arend.vanspriel@broadcom.com>
Cc: Franky Lin <franky.lin@broadcom.com>
Cc: Hante Meuleman <hante.meuleman@broadcom.com>
Cc: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
Cc: Wright Feng <wright.feng@cypress.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-wireless@vger.kernel.org
Cc: brcm80211-dev-list.pdl@broadcom.com
Cc: brcm80211-dev-list@cypress.com
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200821071644.109970-10-lee.jones@linaro.org
parent a451ff85

drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c

+3 −35
Original line number Original line Diff line number Diff line
@@ -842,7 +842,6 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) 
	uint supr_status;

	uint supr_status;

	bool lastframe;

	bool lastframe;

	struct ieee80211_hdr *h;

	struct ieee80211_hdr *h;

	u16 mcl;

	struct ieee80211_tx_info *tx_info;

	struct ieee80211_tx_info *tx_info;

	struct ieee80211_tx_rate *txrate;

	struct ieee80211_tx_rate *txrate;

	int i;

	int i;
@@ -879,7 +878,6 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) 
	}

	}





	txh = (struct d11txh *) (p->data);

	txh = (struct d11txh *) (p->data);

	mcl = le16_to_cpu(txh->MacTxControlLow);





	if (txs->phyerr)

	if (txs->phyerr)

		brcms_dbg_tx(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",

		brcms_dbg_tx(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
@@ -1776,7 +1774,6 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw) 
{

{

	struct brcms_phy_pub *pih = wlc_hw->band->pi;

	struct brcms_phy_pub *pih = wlc_hw->band->pi;

	u32 phy_bw_clkbits;

	u32 phy_bw_clkbits;

	bool phy_in_reset = false;





	brcms_dbg_info(wlc_hw->d11core, "wl%d: reset phy\n", wlc_hw->unit);

	brcms_dbg_info(wlc_hw->d11core, "wl%d: reset phy\n", wlc_hw->unit);
@@ -1799,7 +1796,6 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw) 
		/* reset the PHY */

		/* reset the PHY */

		brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_PCLKE),

		brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_PCLKE),

				   (SICF_PRST | SICF_PCLKE));

				   (SICF_PRST | SICF_PCLKE));

		phy_in_reset = true;

	} else {

	} else {

		brcms_b_core_ioctl(wlc_hw,

		brcms_b_core_ioctl(wlc_hw,

				   (SICF_PRST | SICF_PCLKE | SICF_BWMASK),

				   (SICF_PRST | SICF_PCLKE | SICF_BWMASK),
@@ -2270,11 +2266,8 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw, 




static void brcms_ucode_download(struct brcms_hardware *wlc_hw)

static void brcms_ucode_download(struct brcms_hardware *wlc_hw)

{

{

	struct brcms_c_info *wlc;

	struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;

	struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;





	wlc = wlc_hw->wlc;



	if (wlc_hw->ucode_loaded)

	if (wlc_hw->ucode_loaded)

		return;

		return;
@@ -3173,7 +3166,6 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) 
{

{

	struct brcms_hardware *wlc_hw = wlc->hw;

	struct brcms_hardware *wlc_hw = wlc->hw;

	struct bcma_device *core = wlc_hw->d11core;

	struct bcma_device *core = wlc_hw->d11core;

	u32 sflags;

	u32 bcnint_us;

	u32 bcnint_us;

	uint i = 0;

	uint i = 0;

	bool fifosz_fixup = false;

	bool fifosz_fixup = false;
@@ -3206,7 +3198,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) 




	brcms_c_gpio_init(wlc);

	brcms_c_gpio_init(wlc);





	sflags = bcma_aread32(core, BCMA_IOST);

	bcma_aread32(core, BCMA_IOST);





	if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {

	if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {

		if (BRCMS_ISNPHY(wlc_hw->band))

		if (BRCMS_ISNPHY(wlc_hw->band))
@@ -3899,7 +3891,6 @@ static void brcms_c_setband(struct brcms_c_info *wlc, 
static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)

static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)

{

{

	uint bandunit;

	uint bandunit;

	bool switchband = false;

	u16 old_chanspec = wlc->chanspec;

	u16 old_chanspec = wlc->chanspec;





	if (!brcms_c_valid_chanspec_db(wlc->cmi, chanspec)) {

	if (!brcms_c_valid_chanspec_db(wlc->cmi, chanspec)) {
@@ -3912,7 +3903,6 @@ static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec) 
	if (wlc->pub->_nbands > 1) {

	if (wlc->pub->_nbands > 1) {

		bandunit = chspec_bandunit(chanspec);

		bandunit = chspec_bandunit(chanspec);

		if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) {

		if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) {

			switchband = true;

			if (wlc->bandlocked) {

			if (wlc->bandlocked) {

				brcms_err(wlc->hw->d11core,

				brcms_err(wlc->hw->d11core,

					  "wl%d: %s: chspec %d band is locked!\n",

					  "wl%d: %s: chspec %d band is locked!\n",
@@ -5179,7 +5169,6 @@ uint brcms_c_down(struct brcms_c_info *wlc) 




	uint callbacks = 0;

	uint callbacks = 0;

	int i;

	int i;

	bool dev_gone = false;





	brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);

	brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
@@ -5197,7 +5186,7 @@ uint brcms_c_down(struct brcms_c_info *wlc) 




	callbacks += brcms_b_bmac_down_prep(wlc->hw);

	callbacks += brcms_b_bmac_down_prep(wlc->hw);





	dev_gone = brcms_deviceremoved(wlc);

	brcms_deviceremoved(wlc);





	/* Call any registered down handlers */

	/* Call any registered down handlers */

	for (i = 0; i < BRCMS_MAXMODULES; i++) {

	for (i = 0; i < BRCMS_MAXMODULES; i++) {
@@ -5390,15 +5379,7 @@ brcms_c_set_internal_rateset(struct brcms_c_info *wlc, 




static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)

static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)

{

{

	u8 r;

	wlc_phy_ofdm_rateset_war(wlc->band->pi, false);

	bool war = false;



	if (wlc->pub->associated)

		r = wlc->bsscfg->current_bss->rateset.rates[0];

	else

		r = wlc->default_bss->rateset.rates[0];



	wlc_phy_ofdm_rateset_war(wlc->band->pi, war);

}

}





int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel)

int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel)
@@ -5873,7 +5854,6 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
	bool issgi = ((int_val & NRATE_SGI_MASK) >> NRATE_SGI_SHIFT);

	bool issgi = ((int_val & NRATE_SGI_MASK) >> NRATE_SGI_SHIFT);

	bool override_mcs_only = ((int_val & NRATE_OVERRIDE_MCS_ONLY)

	bool override_mcs_only = ((int_val & NRATE_OVERRIDE_MCS_ONLY)

				  == NRATE_OVERRIDE_MCS_ONLY);

				  == NRATE_OVERRIDE_MCS_ONLY);

	int bcmerror = 0;





	if (!ismcs)

	if (!ismcs)

		return (u32) rate;

		return (u32) rate;
@@ -5884,7 +5864,6 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
		if (stf > PHY_TXC1_MODE_SDM) {

		if (stf > PHY_TXC1_MODE_SDM) {

			brcms_err(core, "wl%d: %s: Invalid stf\n",

			brcms_err(core, "wl%d: %s: Invalid stf\n",

				  wlc->pub->unit, __func__);

				  wlc->pub->unit, __func__);

			bcmerror = -EINVAL;

			goto done;

			goto done;

		}

		}
@@ -5895,7 +5874,6 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
			     && (stf != PHY_TXC1_MODE_CDD))) {

			     && (stf != PHY_TXC1_MODE_CDD))) {

				brcms_err(core, "wl%d: %s: Invalid mcs 32\n",

				brcms_err(core, "wl%d: %s: Invalid mcs 32\n",

					  wlc->pub->unit, __func__);

					  wlc->pub->unit, __func__);

				bcmerror = -EINVAL;

				goto done;

				goto done;

			}

			}

			/* mcs > 7 must use stf SDM */

			/* mcs > 7 must use stf SDM */
@@ -5917,7 +5895,6 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
			     && (stf == PHY_TXC1_MODE_STBC))) {

			     && (stf == PHY_TXC1_MODE_STBC))) {

				brcms_err(core, "wl%d: %s: Invalid STBC\n",

				brcms_err(core, "wl%d: %s: Invalid STBC\n",

					  wlc->pub->unit, __func__);

					  wlc->pub->unit, __func__);

				bcmerror = -EINVAL;

				goto done;

				goto done;

			}

			}

		}

		}
@@ -5925,7 +5902,6 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
		if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) {

		if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) {

			brcms_err(core, "wl%d: %s: Invalid OFDM\n",

			brcms_err(core, "wl%d: %s: Invalid OFDM\n",

				  wlc->pub->unit, __func__);

				  wlc->pub->unit, __func__);

			bcmerror = -EINVAL;

			goto done;

			goto done;

		}

		}

	} else if (is_cck_rate(rate)) {

	} else if (is_cck_rate(rate)) {
@@ -5933,20 +5909,17 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
		    || (stf != PHY_TXC1_MODE_SISO)) {

		    || (stf != PHY_TXC1_MODE_SISO)) {

			brcms_err(core, "wl%d: %s: Invalid CCK\n",

			brcms_err(core, "wl%d: %s: Invalid CCK\n",

				  wlc->pub->unit, __func__);

				  wlc->pub->unit, __func__);

			bcmerror = -EINVAL;

			goto done;

			goto done;

		}

		}

	} else {

	} else {

		brcms_err(core, "wl%d: %s: Unknown rate type\n",

		brcms_err(core, "wl%d: %s: Unknown rate type\n",

			  wlc->pub->unit, __func__);

			  wlc->pub->unit, __func__);

		bcmerror = -EINVAL;

		goto done;

		goto done;

	}

	}

	/* make sure multiple antennae are available for non-siso rates */

	/* make sure multiple antennae are available for non-siso rates */

	if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) {

	if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) {

		brcms_err(core, "wl%d: %s: SISO antenna but !SISO "

		brcms_err(core, "wl%d: %s: SISO antenna but !SISO "

			  "request\n", wlc->pub->unit, __func__);

			  "request\n", wlc->pub->unit, __func__);

		bcmerror = -EINVAL;

		goto done;

		goto done;

	}

	}
@@ -6210,7 +6183,6 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, 
	bool use_rts = false;

	bool use_rts = false;

	bool use_cts = false;

	bool use_cts = false;

	bool use_rifs = false;

	bool use_rifs = false;

	bool short_preamble[2] = { false, false };

	u8 preamble_type[2] = { BRCMS_LONG_PREAMBLE, BRCMS_LONG_PREAMBLE };

	u8 preamble_type[2] = { BRCMS_LONG_PREAMBLE, BRCMS_LONG_PREAMBLE };

	u8 rts_preamble_type[2] = { BRCMS_LONG_PREAMBLE, BRCMS_LONG_PREAMBLE };

	u8 rts_preamble_type[2] = { BRCMS_LONG_PREAMBLE, BRCMS_LONG_PREAMBLE };

	u8 *rts_plcp, rts_plcp_fallback[D11_PHY_HDR_LEN];

	u8 *rts_plcp, rts_plcp_fallback[D11_PHY_HDR_LEN];
@@ -6296,10 +6268,6 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, 
				rspec[k] =

				rspec[k] =

				    hw->wiphy->bands[tx_info->band]->

				    hw->wiphy->bands[tx_info->band]->

				    bitrates[txrate[k]->idx].hw_value;

				    bitrates[txrate[k]->idx].hw_value;

				short_preamble[k] =

				    txrate[k]->

				    flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE ?

				    true : false;

			} else {

			} else {

				rspec[k] = BRCM_RATE_1M;

				rspec[k] = BRCM_RATE_1M;

			}

			}