rtlwifi: btcoexist: Fix if == else warnings in halbtc8821a1ant.c

The 0-DAY kernel test infrastructure reports the following:
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c:1771:1-3: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c:2126:3-5: WARNING: possible condition with no effect (if == else)

Reported-by: kbuild-all@01.org
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 20562f081c968ef4e955d5403c44a901d5038030..8b689ed9a629bce30472d2b61adb562d24c071af 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1768,11 +1768,7 @@ static void btc8821a1ant_act_bt_sco_hid_only_busy(struct btc_coexist *btcoexist,
        /* tdma and coex table*/
        halbtc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);
 
-       if (BT_8821A_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN ==
-           wifi_status)
-               halbtc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
-       else
-               halbtc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
+       halbtc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
 }
 
 static void btc8821a1ant_act_wifi_con_bt_acl_busy(struct btc_coexist *btcoexist,
@@ -2123,16 +2119,8 @@ static void halbtc8821a1ant_run_coexist_mechanism(struct btc_coexist *btcoexist)
                        wifi_rssi_state =
                                 halbtc8821a1ant_WifiRssiState(btcoexist, 1, 2,
                                                               30, 0);
-                       if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-                           (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-                               halbtc8821a1ant_limited_tx(btcoexist,
-                                                          NORMAL_EXEC, 1, 1,
-                                                          1, 1);
-                       } else {
-                               halbtc8821a1ant_limited_tx(btcoexist,
-                                                          NORMAL_EXEC, 1, 1,
-                                                          1, 1);
-                       }
+                       halbtc8821a1ant_limited_tx(btcoexist,
+                                                  NORMAL_EXEC, 1, 1, 1, 1);
                } else {
                        halbtc8821a1ant_limited_tx(btcoexist, NORMAL_EXEC,
                                                   0, 0, 0, 0);