Commit d477a485 authored by YueHaibing's avatar YueHaibing Committed by Kalle Valo

rtlwifi: btcoex: Remove set but not used variable 'len' and 'asso_type_v2'

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

drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c: In function rtl_btc_btmpinfo_notify:
drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c:319:17: warning: variable len set but not used [-Wunused-but-set-variable]
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c: In function exhalbtc_connect_notify:
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1581:16: warning: variable asso_type_v2 set but not used [-Wunused-but-set-variable]

'len' is never used since commit 6aad6075 ("rtlwifi:
Add BT_MP_INFO to c2h handler.") so can be removed.

'asso_type_v2' is not used since introduction in
commit 0843e98a ("rtlwifi: btcoex: add assoc
type v2 to connection notify")
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3e42a66d
...@@ -1578,7 +1578,7 @@ void exhalbtc_scan_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg, ...@@ -1578,7 +1578,7 @@ void exhalbtc_scan_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,
void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action) void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action)
{ {
u8 asso_type, asso_type_v2; u8 asso_type;
bool wifi_under_5g; bool wifi_under_5g;
if (!halbtc_is_bt_coexist_available(btcoexist)) if (!halbtc_is_bt_coexist_available(btcoexist))
...@@ -1589,15 +1589,10 @@ void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action) ...@@ -1589,15 +1589,10 @@ void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action)
btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g); btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_UNDER_5G, &wifi_under_5g);
if (action) { if (action)
asso_type = BTC_ASSOCIATE_START; asso_type = BTC_ASSOCIATE_START;
asso_type_v2 = wifi_under_5g ? BTC_ASSOCIATE_5G_START : else
BTC_ASSOCIATE_START;
} else {
asso_type = BTC_ASSOCIATE_FINISH; asso_type = BTC_ASSOCIATE_FINISH;
asso_type_v2 = wifi_under_5g ? BTC_ASSOCIATE_5G_FINISH :
BTC_ASSOCIATE_FINISH;
}
halbtc_leave_low_power(btcoexist); halbtc_leave_low_power(btcoexist);
......
...@@ -316,7 +316,7 @@ void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length) ...@@ -316,7 +316,7 @@ void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)
void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length) void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)
{ {
struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv); struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);
u8 extid, seq, len; u8 extid, seq;
u16 bt_real_fw_ver; u16 bt_real_fw_ver;
u8 bt_fw_ver; u8 bt_fw_ver;
u8 *data; u8 *data;
...@@ -332,7 +332,6 @@ void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length) ...@@ -332,7 +332,6 @@ void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)
if (extid != 1) /* C2H_TRIG_BY_BT_FW = 1 */ if (extid != 1) /* C2H_TRIG_BY_BT_FW = 1 */
return; return;
len = tmp_buf[1] >> 4;
seq = tmp_buf[2] >> 4; seq = tmp_buf[2] >> 4;
data = &tmp_buf[3]; data = &tmp_buf[3];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment