Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6375d403 authored by YueHaibing's avatar YueHaibing Committed by Kalle Valo
Browse files

brcmsmac: remove set but not used variables 'phybw40, maxtargetpwr' 



Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c:1202:5: warning: variable 'phybw40' set but not used [-Wunused-but-set-variable]
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c:4625:5: warning: variable 'phybw40' set but not used [-Wunused-but-set-variable]
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c:4834:5: warning: variable 'phybw40' set but not used [-Wunused-but-set-variable]

drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c:3085:17: warning: variable 'maxtargetpwr' set but not used [-Wunused-but-set-variable]
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c:4215:17: warning: variable 'maxtargetpwr' set but not used [-Wunused-but-set-variable]

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent bfeffd15

drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c

+2 −11
Original line number Diff line number Diff line
@@ -1199,8 +1199,6 @@ wlc_lcnphy_rx_iq_est(struct brcms_phy *pi, 
{

	int wait_count = 0;

	bool result = true;

	u8 phybw40;

	phybw40 = CHSPEC_IS40(pi->radio_chanspec);



	mod_phy_reg(pi, 0x6da, (0x1 << 5), (1) << 5);
@@ -3082,7 +3080,7 @@ static void wlc_lcnphy_tx_pwr_ctrl_init(struct brcms_phy_pub *ppi) 
	u8 bbmult;

	struct phytbl_info tab;

	s32 a1, b0, b1;

	s32 tssi, pwr, maxtargetpwr, mintargetpwr;

	s32 tssi, pwr, mintargetpwr;

	bool suspend;

	struct brcms_phy *pi = container_of(ppi, struct brcms_phy, pubpi_ro);
@@ -3119,7 +3117,6 @@ static void wlc_lcnphy_tx_pwr_ctrl_init(struct brcms_phy_pub *ppi) 
		b0 = pi->txpa_2g[0];

		b1 = pi->txpa_2g[1];

		a1 = pi->txpa_2g[2];

		maxtargetpwr = wlc_lcnphy_tssi2dbm(10, a1, b0, b1);

		mintargetpwr = wlc_lcnphy_tssi2dbm(125, a1, b0, b1);



		tab.tbl_id = LCNPHY_TBL_ID_TXPWRCTL;
@@ -4212,7 +4209,7 @@ static void wlc_lcnphy_periodic_cal(struct brcms_phy *pi) 
	s8 index;

	struct phytbl_info tab;

	s32 a1, b0, b1;

	s32 tssi, pwr, maxtargetpwr, mintargetpwr;

	s32 tssi, pwr, mintargetpwr;

	struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy;



	pi->phy_lastcal = pi->sh->now;
@@ -4249,7 +4246,6 @@ static void wlc_lcnphy_periodic_cal(struct brcms_phy *pi) 
		b0 = pi->txpa_2g[0];

		b1 = pi->txpa_2g[1];

		a1 = pi->txpa_2g[2];

		maxtargetpwr = wlc_lcnphy_tssi2dbm(10, a1, b0, b1);

		mintargetpwr = wlc_lcnphy_tssi2dbm(125, a1, b0, b1);



		tab.tbl_id = LCNPHY_TBL_ID_TXPWRCTL;
@@ -4622,13 +4618,10 @@ static void wlc_lcnphy_radio_init(struct brcms_phy *pi) 
static void wlc_lcnphy_tbl_init(struct brcms_phy *pi)

{

	uint idx;

	u8 phybw40;

	struct phytbl_info tab;

	const struct phytbl_info *tb;

	u32 val;



	phybw40 = CHSPEC_IS40(pi->radio_chanspec);



	for (idx = 0; idx < dot11lcnphytbl_info_sz_rev0; idx++)

		wlc_lcnphy_write_table(pi, &dot11lcnphytbl_info_rev0[idx]);
@@ -4831,9 +4824,7 @@ static void wlc_lcnphy_baseband_init(struct brcms_phy *pi) 


void wlc_phy_init_lcnphy(struct brcms_phy *pi)

{

	u8 phybw40;

	struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy;

	phybw40 = CHSPEC_IS40(pi->radio_chanspec);



	pi_lcn->lcnphy_cal_counter = 0;

	pi_lcn->lcnphy_cal_temper = pi_lcn->lcnphy_rawtempsense;