rtlwifi: remove duplicate code

Remove and refactor some code in order to avoid having identical code
for different branches.

Notice that the logic has been there since 2014.

Addresses-Coverity-ID: 1426199 ("Identical code for different branches")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
index 279fe01bb55ea2b8c53d982442f3be4727f894f1..df3facc8e5a41cdce7f00418dc7ec5bfbb2a346f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
@@ -2876,25 +2876,10 @@ static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
                btc8723b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 13);
 
        /* sw mechanism */
-       if (BTC_WIFI_BW_HT40 == wifi_bw) {
-               if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-                   (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-                       btc8723b2ant_sw_mechanism(btcoexist, true, true,
-                                                 false, false);
-               } else {
-                       btc8723b2ant_sw_mechanism(btcoexist, true, true,
-                                                 false, false);
-               }
-       } else {
-               if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-                   (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-                       btc8723b2ant_sw_mechanism(btcoexist, false, true,
-                                                 false, false);
-               } else {
-                       btc8723b2ant_sw_mechanism(btcoexist, false, true,
-                                                 false, false);
-               }
-       }
+       if (wifi_bw == BTC_WIFI_BW_HT40)
+               btc8723b2ant_sw_mechanism(btcoexist, true, true, false, false);
+       else
+               btc8723b2ant_sw_mechanism(btcoexist, false, true, false, false);
 }
 
 /* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */