wifi: rtlwifi: remove unused timer and related code

[ Upstream commit 358b94f0a7cadd2ec7824531d54dadaa8b71de04 ]

Drop unused 'dualmac_easyconcurrent_retrytimer' of 'struct rtl_works',
corresponding 'rtl_easy_concurrent_retrytimer_callback()' handler,
'dualmac_easy_concurrent' function pointer of 'struct rtl_hal_ops'
and related call to 'timer_setup()' in '_rtl_init_deferred_work()'.

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/20230602065940.149198-1-dmantipov@yandex.ru
Stable-dep-of: 2fdac64c3c35 ("wifi: rtlwifi: remove unused check_buddy_priv")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index a7ef84f5593997f2f847429f99233fa2dc215c10..e2552bcdc6a026909a86103f5ccee84d28e3902a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -452,8 +452,7 @@ static int _rtl_init_deferred_work(struct ieee80211_hw *hw)
        /* <1> timer */
        timer_setup(&rtlpriv->works.watchdog_timer,
                    rtl_watch_dog_timer_callback, 0);
-       timer_setup(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,
-                   rtl_easy_concurrent_retrytimer_callback, 0);
+
        /* <2> work queue */
        rtlpriv->works.hw = hw;
        rtlpriv->works.rtl_wq = wq;
@@ -2365,19 +2364,6 @@ static void rtl_c2hcmd_wq_callback(struct work_struct *work)
        rtl_c2hcmd_launcher(hw, 1);
 }
 
-void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t)
-{
-       struct rtl_priv *rtlpriv =
-               from_timer(rtlpriv, t, works.dualmac_easyconcurrent_retrytimer);
-       struct ieee80211_hw *hw = rtlpriv->hw;
-       struct rtl_priv *buddy_priv = rtlpriv->buddy_priv;
-
-       if (buddy_priv == NULL)
-               return;
-
-       rtlpriv->cfg->ops->dualmac_easy_concurrent(hw);
-}
-
 /*********************************************************
  *
  * frame process functions

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index 0e4f8a8ae3a5fcf51eb61da992e9dc3d9087b208..f081a9a90563f5388224df32f76eddd18cee0720 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -124,7 +124,6 @@ int rtl_send_smps_action(struct ieee80211_hw *hw,
 u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);
 void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);
 u8 rtl_tid_to_ac(u8 tid);
-void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t);
 extern struct rtl_global_var rtl_global_var;
 void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 0bac788ccd6e3122fde31e6dfa0f9977e557382b..1991cffd3dd4a53bba8557c1a29788b46f559855 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2300,7 +2300,6 @@ struct rtl_hal_ops {
                          u32 regaddr, u32 bitmask, u32 data);
        void (*linked_set_reg)(struct ieee80211_hw *hw);
        void (*chk_switch_dmdp)(struct ieee80211_hw *hw);
-       void (*dualmac_easy_concurrent)(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,
@@ -2465,7 +2464,6 @@ struct rtl_works {
 
        /*timer */
        struct timer_list watchdog_timer;
-       struct timer_list dualmac_easyconcurrent_retrytimer;
        struct timer_list fw_clockoff_timer;
        struct timer_list fast_antenna_training_timer;
        /*task */