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

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

brcmsmac: remove three set but not used variables 



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

drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c: In function 'brcms_c_set_gmode':
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:5257:7: warning: variable 'preamble_restrict' set but not used [-Wunused-but-set-variable]
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:5256:6: warning: variable 'preamble' set but not used [-Wunused-but-set-variable]
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:5251:7: warning: variable 'shortslot_restrict' set but not used [-Wunused-but-set-variable]

They are never used so can be removed.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 937a194a

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

+0 −13
Original line number Diff line number Diff line
@@ -5248,15 +5248,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config) 
	/* Default to 54g Auto */

	/* Advertise and use shortslot (-1/0/1 Auto/Off/On) */

	s8 shortslot = BRCMS_SHORTSLOT_AUTO;

	bool shortslot_restrict = false; /* Restrict association to stations

					  * that support shortslot

					  */

	bool ofdm_basic = false;	/* Make 6, 12, and 24 basic rates */

	/* Advertise and use short preambles (-1/0/1 Auto/Off/On) */

	int preamble = BRCMS_PLCP_LONG;

	bool preamble_restrict = false;	/* Restrict association to stations

					 * that support short preambles

					 */

	struct brcms_band *band;



	/* if N-support is enabled, allow Gmode set as long as requested
@@ -5297,16 +5289,11 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config) 


	case GMODE_ONLY:

		ofdm_basic = true;

		preamble = BRCMS_PLCP_SHORT;

		preamble_restrict = true;

		break;



	case GMODE_PERFORMANCE:

		shortslot = BRCMS_SHORTSLOT_ON;

		shortslot_restrict = true;

		ofdm_basic = true;

		preamble = BRCMS_PLCP_SHORT;

		preamble_restrict = true;

		break;



	default: