projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 906a1b4)
rtlwifi: halbtc8723b2ant: Remove a bunch of set but unused variables
authorLee Jones <lee.jones@linaro.org>
Mon, 2 Nov 2020 11:23:54 +0000 (11:23 +0000)
committerKalle Valo <kvalo@codeaurora.org>
Sat, 7 Nov 2020 16:14:37 +0000 (18:14 +0200)
Fixes the following W=1 kernel build warning(s):

 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_wifi_idle_process’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:1631:40: warning: variable ‘bt_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:1631:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_sco’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2767:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_hid’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2810:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_a2dp’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2855:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_a2dp_pan_hs’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2929:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_pan_edr’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2976:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_pan_hs’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3028:22: warning: variable ‘wifi_rssi_state1’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3028:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_pan_edr_a2dp’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3066:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_pan_edr_hid’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3121:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_hid_a2dp_pan_edr’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3185:5: warning: variable ‘wifi_rssi_state’ set but not used [-Wunused-but-set-variable]
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c: In function ‘btc8723b2ant_action_hid_a2dp’:
 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3244:5: warning: variable ‘wifi_rssi_state’ 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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201102112410.1049272-26-lee.jones@linaro.org
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c patch | blob | history

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
index fb57cc8b2e471e24f7a23a2ba6ed4eaca3ba051b..7a71f063015ab771f030ecf7354c0e4aa4fcca60 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
@@ -1628,17 +1628,17 @@ static void btc8723b2ant_action_wifi_link_process(struct btc_coexist
 static bool btc8723b2ant_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;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                 coex_dm->switch_thres_offset - coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
              coex_dm->switch_thres_offset - coex_dm->switch_thres_offset;
-       bt_rssi_state = btc8723b2ant_bt_rssi_state(btcoexist, 2, tmp, 0);
+       btc8723b2ant_bt_rssi_state(btcoexist, 2, tmp, 0);
 
        btcoexist->btc_get(btcoexist, BTC_GET_U1_AP_NUM, &ap_num);
 
@@ -2764,10 +2764,10 @@ static void btc8723b2ant_tdma_duration_adjust(struct btc_coexist *btcoexist,
 /* SCO only or SCO+PAN(HS) */
 static void btc8723b2ant_action_sco(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, bt_rssi_state;
+       u8 bt_rssi_state;
        u32 wifi_bw;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        bt_rssi_state = btc8723b2ant_bt_rssi_state(
                btcoexist, 2, BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
                                               coex_dm->switch_thres_offset,
@@ -2807,12 +2807,12 @@ static void btc8723b2ant_action_sco(struct btc_coexist *btcoexist)
 
 static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, bt_rssi_state;
+       u8 bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        bt_rssi_state = btc8723b2ant_bt_rssi_state(btcoexist, 2, tmp, 0);
 
        btcoexist->btc_set_rf_reg(btcoexist, BTC_RF_A, 0x1, 0xfffff, 0x0);
@@ -2852,13 +2852,13 @@ static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
 /* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */
 static void btc8723b2ant_action_a2dp(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 ap_num = 0;
        u8 tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2, 40, 0);
        bt_rssi_state = btc8723b2ant_bt_rssi_state(btcoexist, 2, tmp, 0);
 
@@ -2926,12 +2926,12 @@ static void btc8723b2ant_action_a2dp(struct btc_coexist *btcoexist)
 
 static void btc8723b2ant_action_a2dp_pan_hs(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
@@ -2973,12 +2973,12 @@ static void btc8723b2ant_action_a2dp_pan_hs(struct btc_coexist *btcoexist)
 
 static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
@@ -3025,13 +3025,13 @@ static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist)
 /* PAN(HS) only */
 static void btc8723b2ant_action_pan_hs(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
-       wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
@@ -3063,12 +3063,12 @@ static void btc8723b2ant_action_pan_hs(struct btc_coexist *btcoexist)
 /* PAN(EDR) + A2DP */
 static void btc8723b2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
@@ -3118,12 +3118,12 @@ static void btc8723b2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist)
 
 static void btc8723b2ant_action_pan_edr_hid(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
@@ -3182,12 +3182,12 @@ static void btc8723b2ant_action_pan_edr_hid(struct btc_coexist *btcoexist)
 /* HID + A2DP + PAN(EDR) */
 static void btc8723b2ant_action_hid_a2dp_pan_edr(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
@@ -3241,13 +3241,13 @@ static void btc8723b2ant_action_hid_a2dp_pan_edr(struct btc_coexist *btcoexist)
 
 static void btc8723b2ant_action_hid_a2dp(struct btc_coexist *btcoexist)
 {
-       u8 wifi_rssi_state, wifi_rssi_state1, bt_rssi_state;
+       u8 wifi_rssi_state1, bt_rssi_state;
        u32 wifi_bw;
        u8 ap_num = 0;
        u8 tmp = BT_8723B_2ANT_WIFI_RSSI_COEXSWITCH_THRES -
                        coex_dm->switch_thres_offset;
 
-       wifi_rssi_state = btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
+       btc8723b2ant_wifi_rssi_state(btcoexist, 0, 2, 15, 0);
        wifi_rssi_state1 = btc8723b2ant_wifi_rssi_state(btcoexist, 1, 2,
                                                        tmp, 0);
        tmp = BT_8723B_2ANT_BT_RSSI_COEXSWITCH_THRES -
ep93xx device tree rework repo: git://git.maquefel.me/linux.git