wifi: rtlwifi: drop chk_switch_dmdp() from HAL interface

Since there is no chip-specific code behind 'chk_switch_dmdp()',
there is no need to maintain function pointer in 'struct rtl_hal_ops'
and relevant common code may be simplified. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231016135925.129223-3-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 807a53a97325bfd8b2e4c80c976ea587ece315f4..7ce37fb4fdbf1930b49f114e62be443f0810e247 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -1317,12 +1317,6 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        __le16 fc = rtl_get_fc(skb);
 
-       if (rtlpriv->dm.supp_phymode_switch &&
-           mac->link_state < MAC80211_LINKED &&
-           (ieee80211_is_auth(fc) || ieee80211_is_probe_req(fc))) {
-               if (rtlpriv->cfg->ops->chk_switch_dmdp)
-                       rtlpriv->cfg->ops->chk_switch_dmdp(hw);
-       }
        if (ieee80211_is_auth(fc)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index cc9b2a459386f1aba236fbe098a6e003bc7fa07d..69e97647e3d6b7665445a097d4a26a540ba98617 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -662,13 +662,6 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                if (mac->act_scanning)
                        mac->n_channels++;
 
-               if (rtlpriv->dm.supp_phymode_switch &&
-                       mac->link_state < MAC80211_LINKED &&
-                       !mac->act_scanning) {
-                       if (rtlpriv->cfg->ops->chk_switch_dmdp)
-                               rtlpriv->cfg->ops->chk_switch_dmdp(hw);
-               }
-
                /*
                 *because we should back channel to
                 *current_network.chan in scanning,
@@ -1197,10 +1190,6 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                        mac->vendor = PEER_UNKNOWN;
                        mac->mode = 0;
 
-                       if (rtlpriv->dm.supp_phymode_switch) {
-                               if (rtlpriv->cfg->ops->chk_switch_dmdp)
-                                       rtlpriv->cfg->ops->chk_switch_dmdp(hw);
-                       }
                        rtl_dbg(rtlpriv, COMP_MAC80211, DBG_DMESG,
                                "BSS_CHANGED_UN_ASSOC\n");
                }
@@ -1464,11 +1453,6 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw,
                rtlpriv->btcoexist.btc_ops->btc_scan_notify_wifi_only(rtlpriv,
                                                                      1);
 
-       if (rtlpriv->dm.supp_phymode_switch) {
-               if (rtlpriv->cfg->ops->chk_switch_dmdp)
-                       rtlpriv->cfg->ops->chk_switch_dmdp(hw);
-       }
-
        if (mac->link_state == MAC80211_LINKED) {
                rtl_lps_leave(hw, true);
                mac->link_state = MAC80211_LINKED_SCANNING;

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index ef072b5c3fd3b39de0036d97553ac88cdacb3830..31a481f43a07d759ad95260e46e503cf4cae65b2 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2275,7 +2275,6 @@ struct rtl_hal_ops {
        void (*set_rfreg)(struct ieee80211_hw *hw, enum radio_path rfpath,
                          u32 regaddr, u32 bitmask, u32 data);
        void (*linked_set_reg)(struct ieee80211_hw *hw);
-       void (*chk_switch_dmdp)(struct ieee80211_hw *hw);
        void (*dualmac_switch_to_dmdp)(struct ieee80211_hw *hw);
        bool (*phy_rf6052_config)(struct ieee80211_hw *hw);
        void (*phy_rf6052_set_cck_txpower)(struct ieee80211_hw *hw,