rtlwifi/rtw88: convert tasklets to use new tasklet_setup() API

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly
and remove .data field.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200817090637.26887-16-allen.cryptic@gmail.com

diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index 25335bd2873b6fe9a1a62bd95aa24d100dbb8ce6..42099369fa35b2226f27d913d1d6ed666828c9ed 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -1061,16 +1061,18 @@ done:
        return ret;
 }
 
-static void _rtl_pci_irq_tasklet(unsigned long data)
+static void _rtl_pci_irq_tasklet(struct tasklet_struct *t)
 {
-       struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
+       struct rtl_priv *rtlpriv = from_tasklet(rtlpriv, t, works.irq_tasklet);
+       struct ieee80211_hw *hw = rtlpriv->hw;
        _rtl_pci_tx_chk_waitq(hw);
 }
 
-static void _rtl_pci_prepare_bcn_tasklet(unsigned long data)
+static void _rtl_pci_prepare_bcn_tasklet(struct tasklet_struct *t)
 {
-       struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       struct rtl_priv *rtlpriv = from_tasklet(rtlpriv, t,
+                                               works.irq_prepare_bcn_tasklet);
+       struct ieee80211_hw *hw = rtlpriv->hw;
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl8192_tx_ring *ring = NULL;
@@ -1194,12 +1196,9 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw,
        rtlpci->acm_method = EACMWAY2_SW;
 
        /*task */
-       tasklet_init(&rtlpriv->works.irq_tasklet,
-                    _rtl_pci_irq_tasklet,
-                    (unsigned long)hw);
-       tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet,
-                    _rtl_pci_prepare_bcn_tasklet,
-                    (unsigned long)hw);
+       tasklet_setup(&rtlpriv->works.irq_tasklet, _rtl_pci_irq_tasklet);
+       tasklet_setup(&rtlpriv->works.irq_prepare_bcn_tasklet,
+                    _rtl_pci_prepare_bcn_tasklet);
        INIT_WORK(&rtlpriv->works.lps_change_work,
                  rtl_lps_change_work_callback);
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index d05e709536eab4b5ebe7bb18024d57b4f77bc986..8740818e8d87b1c9d9beecae06d50460597fa818 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -289,7 +289,7 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw)
        return 0;
 }
 
-static void _rtl_rx_work(unsigned long param);
+static void _rtl_rx_work(struct tasklet_struct *t);
 
 static int _rtl_usb_init_rx(struct ieee80211_hw *hw)
 {
@@ -310,8 +310,7 @@ static int _rtl_usb_init_rx(struct ieee80211_hw *hw)
        init_usb_anchor(&rtlusb->rx_cleanup_urbs);
 
        skb_queue_head_init(&rtlusb->rx_queue);
-       rtlusb->rx_work_tasklet.func = _rtl_rx_work;
-       rtlusb->rx_work_tasklet.data = (unsigned long)rtlusb;
+       rtlusb->rx_work_tasklet.func = (void(*)(unsigned long))_rtl_rx_work;
 
        return 0;
 }
@@ -528,9 +527,9 @@ static void _rtl_rx_pre_process(struct ieee80211_hw *hw, struct sk_buff *skb)
 
 #define __RX_SKB_MAX_QUEUED    64
 
-static void _rtl_rx_work(unsigned long param)
+static void _rtl_rx_work(struct tasklet_struct *t)
 {
-       struct rtl_usb *rtlusb = (struct rtl_usb *)param;
+       struct rtl_usb *rtlusb = from_tasklet(rtlusb, t, rx_work_tasklet);
        struct ieee80211_hw *hw = usb_get_intfdata(rtlusb->intf);
        struct sk_buff *skb;
 

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 9d454f0004d2c13a8c416d6d87bdd0b4e01f62cf..9770982b2f14babf73bb68b7196b3b81d7f02a68 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -1422,8 +1422,7 @@ int rtw_core_init(struct rtw_dev *rtwdev)
 
        timer_setup(&rtwdev->tx_report.purge_timer,
                    rtw_tx_report_purge_timer, 0);
-       tasklet_init(&rtwdev->tx_tasklet, rtw_tx_tasklet,
-                    (unsigned long)rtwdev);
+       tasklet_setup(&rtwdev->tx_tasklet, rtw_tx_tasklet);
 
        INIT_DELAYED_WORK(&rtwdev->watch_dog_work, rtw_watch_dog_work);
        INIT_DELAYED_WORK(&coex->bt_relink_work, rtw_coex_bt_relink_work);

diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c
index 7fcc992b01a8fcceff6c7a0cc582ba17b01ca41c..ca8072177ae384f1b2b31906c429ab95ebb40ede 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/tx.c
+++ b/drivers/net/wireless/realtek/rtw88/tx.c
@@ -587,9 +587,9 @@ static void rtw_txq_push(struct rtw_dev *rtwdev,
        rcu_read_unlock();
 }
 
-void rtw_tx_tasklet(unsigned long data)
+void rtw_tx_tasklet(struct tasklet_struct *t)
 {
-       struct rtw_dev *rtwdev = (void *)data;
+       struct rtw_dev *rtwdev = from_tasklet(rtwdev, t, tx_tasklet);
        struct rtw_txq *rtwtxq, *tmp;
 
        spin_lock_bh(&rtwdev->txq_lock);

diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h
index cfe84eef59231a7d999cf004f80189dc26584261..6673dbcaa21c115410bfb88488c2a2a1afac5c62 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/tx.h
+++ b/drivers/net/wireless/realtek/rtw88/tx.h
@@ -94,7 +94,7 @@ void rtw_tx(struct rtw_dev *rtwdev,
            struct sk_buff *skb);
 void rtw_txq_init(struct rtw_dev *rtwdev, struct ieee80211_txq *txq);
 void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq);
-void rtw_tx_tasklet(unsigned long data);
+void rtw_tx_tasklet(struct tasklet_struct *t);
 void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,
                            struct rtw_tx_pkt_info *pkt_info,
                            struct ieee80211_sta *sta,