rtlwifi: btcoex: remove identical statements within if-else branches

Since the statements are identical, we can safely remove the statements.
The commit 42e74946f016 ("rtlwifi: btcoexist: Fix if == else warnings in
halbtc8821a1ant.c") had fixed the statements, but the commit c6821613e653
("rtlwifi: btcoex: follow linux coding style") that converted coding style
and upgraded btcoex didn't include the fix.

Reported-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
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 202597cf89156dc9356c2ec20f17da253c2b2764..b5d65872db846c033b1dd2eac3e92884ff809a11 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1584,11 +1584,7 @@ static void btc8821a1ant_act_bt_sco_hid_only_busy(struct btc_coexist *btcoexist,
        /* tdma and coex table */
        btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);
 
-       if (BT_8821A_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN ==
-           wifi_status)
-               btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
-       else
-               btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
+       btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
 }
 
 static void btc8821a1ant_act_wifi_con_bt_acl_busy(struct btc_coexist *btcoexist,
@@ -1991,16 +1987,9 @@ static void btc8821a1ant_run_coexist_mechanism(struct btc_coexist *btcoexist)
                        wifi_rssi_state =
                                btc8821a1ant_wifi_rssi_state(btcoexist, 1, 2,
                                                             30, 0);
-                       if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-                           (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-                               btc8821a1ant_limited_tx(btcoexist,
-                                                       NORMAL_EXEC, 1, 1,
-                                                       0, 1);
-                       } else {
-                               btc8821a1ant_limited_tx(btcoexist,
-                                                       NORMAL_EXEC, 1, 1,
-                                                       0, 1);
-                       }
+                       btc8821a1ant_limited_tx(btcoexist,
+                                               NORMAL_EXEC, 1, 1,
+                                               0, 1);
                } else {
                        btc8821a1ant_limited_tx(btcoexist, NORMAL_EXEC,
                                                0, 0, 0, 0);