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

rtlwifi: halbtc8821a2ant: Remove a bunch of unused variables 



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

 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c: In function ‘btc8821a2ant_action_bt_inquiry’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:1451:40: warning: variable ‘bt_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:1451:22: warning: variable ‘wifi_rssi_state1’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:1451:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c: In function ‘btc8821a2ant_action_wifi_idle_process’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:1519:40: warning: variable ‘bt_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:1519:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c: In function ‘btc8821a2ant_action_pan_hs’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2990:22: warning: variable ‘wifi_rssi_state1’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c: In function ‘btc8821a2ant_action_hid_a2dp’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3277:22: warning: variable ‘wifi_rssi_state1’ set but not used [-Wunused-but-set-variable]

Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: linux-wireless@vger.kernel.org
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/20201102112410.1049272-31-lee.jones@linaro.org
parent 6c75eab0

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c

+12 −15
Original line number Diff line number Diff line
@@ -1448,16 +1448,14 @@ static void btc8821a2ant_init_coex_dm(struct btc_coexist *btcoexist) 
static void btc8821a2ant_action_bt_inquiry(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;

	bool wifi_connected = false;

	bool low_pwr_disable = true;

	bool scan = false, link = false, roam = false;



	wifi_rssi_state =

	btc8821a2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);

	wifi_rssi_state1 = btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

	btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

				BT_8821A_2ANT_WIFI_RSSI_COEXSWITCH_THRES, 0);

	bt_rssi_state = btc8821a2ant_bt_rssi_state(btcoexist,

	btc8821a2ant_bt_rssi_state(btcoexist,

				2, BT_8821A_2ANT_BT_RSSI_COEXSWITCH_THRES, 0);



	btcoexist->btc_set(btcoexist, BTC_SET_ACT_DISABLE_LOW_POWER,
@@ -1516,14 +1514,13 @@ static void btc8821a2ant_action_wifi_link_process(struct btc_coexist *btcoexist) 
static bool btc8821a2ant_action_wifi_idle_process(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;

	u8 wifi_rssi_state1;

	u8 ap_num = 0;



	wifi_rssi_state =

	btc8821a2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);

	wifi_rssi_state1 = btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

			BT_8821A_2ANT_WIFI_RSSI_COEXSWITCH_THRES - 20, 0);

	bt_rssi_state = btc8821a2ant_bt_rssi_state(btcoexist,

	btc8821a2ant_bt_rssi_state(btcoexist,

				2, BT_8821A_2ANT_BT_RSSI_COEXSWITCH_THRES, 0);



	btcoexist->btc_get(btcoexist, BTC_GET_U1_AP_NUM, &ap_num);
@@ -2987,11 +2984,11 @@ static void btc8821a2ant_action_pan_edr(struct btc_coexist *btcoexist) 
/* PAN(HS) only */

static void btc8821a2ant_action_pan_hs(struct btc_coexist *btcoexist)

{

	u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;

	u8 wifi_rssi_state, bt_rssi_state;

	u32 wifi_bw;



	wifi_rssi_state = btc8821a2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);

	wifi_rssi_state1 = btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

	btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

				BT_8821A_2ANT_WIFI_RSSI_COEXSWITCH_THRES, 0);

	bt_rssi_state = btc8821a2ant_bt_rssi_state(btcoexist,

				2, BT_8821A_2ANT_BT_RSSI_COEXSWITCH_THRES, 0);
@@ -3274,11 +3271,11 @@ static void btc8821a2ant_act_hid_a2dp_pan_edr(struct btc_coexist *btcoexist) 
static void btc8821a2ant_action_hid_a2dp(struct btc_coexist *btcoexist)

{

	u32 wifi_bw;

	u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;

	u8 wifi_rssi_state, bt_rssi_state;

	u8 ap_num = 0;



	wifi_rssi_state = btc8821a2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);

	wifi_rssi_state1 = btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

	btc8821a2ant_wifi_rssi_state(btcoexist, 1, 2,

				BT_8821A_2ANT_WIFI_RSSI_COEXSWITCH_THRES, 0);

	bt_rssi_state = btc8821a2ant_bt_rssi_state(btcoexist,

				3, BT_8821A_2ANT_BT_RSSI_COEXSWITCH_THRES, 37);

CRA Git | Maintained and supported by SUSTech CRA and CCSE