rtw88: coex: remove unnecessary feature/function

Because the WLAN RSSI report feature had been implemented at WLAN link info
update function, it is redundant to update WLAN RSSI while BT is updating
link info, so remove the update WLAN RSSI part.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201112031430.4846-3-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index 50df2e1b484258ad254cd1b9fea9e24f67247d50..f0d300e197b7134eb8897876e47a62dc75c36f49 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -397,15 +397,16 @@ static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev)
                coex_stat->bt_disabled = bt_disabled;
                coex_stat->bt_ble_scan_type = 0;
                coex_dm->cur_bt_lna_lvl = 0;
-       }
 
-       if (!coex_stat->bt_disabled) {
-               coex_stat->bt_reenable = true;
-               ieee80211_queue_delayed_work(rtwdev->hw,
-                                            &coex->bt_reenable_work, 15 * HZ);
-       } else {
-               coex_stat->bt_mailbox_reply = false;
-               coex_stat->bt_reenable = false;
+               if (!coex_stat->bt_disabled) {
+                       coex_stat->bt_reenable = true;
+                       ieee80211_queue_delayed_work(rtwdev->hw,
+                                                    &coex->bt_reenable_work,
+                                                    15 * HZ);
+               } else {
+                       coex_stat->bt_mailbox_reply = false;
+                       coex_stat->bt_reenable = false;
+               }
        }
 }
 
@@ -612,15 +613,6 @@ static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev)
                coex_dm->bt_rssi_state[i] = rssi_state;
        }
 
-       for (i = 0; i < COEX_RSSI_STEP; i++) {
-               rssi_state = coex_dm->wl_rssi_state[i];
-               rssi_step = chip->wl_rssi_step[i];
-               rssi = rtwdev->dm_info.min_rssi;
-               rssi_state = rtw_coex_next_rssi_state(rtwdev, rssi_state,
-                                                     rssi, rssi_step);
-               coex_dm->wl_rssi_state[i] = rssi_state;
-       }
-
        if (coex_stat->bt_ble_scan_en &&
            coex_stat->cnt_bt[COEX_CNT_BT_INFOUPDATE] % 3 == 0) {
                u8 scan_type;
@@ -991,7 +983,7 @@ static void rtw_coex_tdma(struct rtw_dev *rtwdev, bool force, u32 tcase)
        bool turn_on;
        bool wl_busy = false;
 
-       if (tcase & TDMA_4SLOT)/* 4-slot (50ms) mode */
+       if (tcase & TDMA_4SLOT) /* 4-slot (50ms) mode */
                rtw_coex_tdma_timer_base(rtwdev, TDMA_TIMER_TYPE_4SLOT);
        else
                rtw_coex_tdma_timer_base(rtwdev, TDMA_TIMER_TYPE_2SLOT);
@@ -2864,11 +2856,6 @@ void rtw_coex_wl_fwdbginfo_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length)
 
 void rtw_coex_wl_status_change_notify(struct rtw_dev *rtwdev, u32 type)
 {
-       struct rtw_coex *coex = &rtwdev->coex;
-
-       if (coex->stop_dm)
-               return;
-
        rtw_coex_run_coex(rtwdev, COEX_RSN_WLSTATUS);
 }