]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: rtw88: remove CPT execution branch never used
authorDmitry Kandybka <d.kandybka@gmail.com>
Fri, 9 Aug 2024 08:53:10 +0000 (11:53 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:28:50 +0000 (16:28 +0200)
[ Upstream commit 77c977327dfaa9ae2e154964cdb89ceb5c7b7cf1 ]

In 'rtw_coex_action_bt_a2dp_pan', 'wl_cpt_test' and 'bt_cpt_test' are
hardcoded to false, so corresponding 'table_case' and 'tdma_case'
assignments are never met.
Also 'rtw_coex_set_rf_para(rtwdev, chip->wl_rf_para_rx[1])' is never
executed. Assuming that CPT was never fully implemented, remove
lookalike leftovers. Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 76f631cb401f ("rtw88: coex: update the mechanism for A2DP + PAN")
Signed-off-by: Dmitry Kandybka <d.kandybka@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20240809085310.10512-1-d.kandybka@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtw88/coex.c

index 86467d2f8888ca6fc05f877624d9e0d03088d341..d35f26919806a7eb7ec987095e54a30d87b56d8c 100644 (file)
@@ -2194,7 +2194,6 @@ static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev)
        struct rtw_coex_stat *coex_stat = &coex->stat;
        struct rtw_efuse *efuse = &rtwdev->efuse;
        u8 table_case, tdma_case;
-       bool wl_cpt_test = false, bt_cpt_test = false;
 
        rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
 
@@ -2202,29 +2201,16 @@ static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev)
        rtw_coex_set_rf_para(rtwdev, chip->wl_rf_para_rx[0]);
        if (efuse->share_ant) {
                /* Shared-Ant */
-               if (wl_cpt_test) {
-                       if (coex_stat->wl_gl_busy) {
-                               table_case = 20;
-                               tdma_case = 17;
-                       } else {
-                               table_case = 10;
-                               tdma_case = 15;
-                       }
-               } else if (bt_cpt_test) {
-                       table_case = 26;
-                       tdma_case = 26;
-               } else {
-                       if (coex_stat->wl_gl_busy &&
-                           coex_stat->wl_noisy_level == 0)
-                               table_case = 14;
-                       else
-                               table_case = 10;
+               if (coex_stat->wl_gl_busy &&
+                   coex_stat->wl_noisy_level == 0)
+                       table_case = 14;
+               else
+                       table_case = 10;
 
-                       if (coex_stat->wl_gl_busy)
-                               tdma_case = 15;
-                       else
-                               tdma_case = 20;
-               }
+               if (coex_stat->wl_gl_busy)
+                       tdma_case = 15;
+               else
+                       tdma_case = 20;
        } else {
                /* Non-Shared-Ant */
                table_case = 112;
@@ -2235,11 +2221,7 @@ static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev)
                        tdma_case = 120;
        }
 
-       if (wl_cpt_test)
-               rtw_coex_set_rf_para(rtwdev, chip->wl_rf_para_rx[1]);
-       else
-               rtw_coex_set_rf_para(rtwdev, chip->wl_rf_para_rx[0]);
-
+       rtw_coex_set_rf_para(rtwdev, chip->wl_rf_para_rx[0]);
        rtw_coex_table(rtwdev, false, table_case);
        rtw_coex_tdma(rtwdev, false, tdma_case);
 }