wireless: mt7601u: 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.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <apais@linux.microsoft.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201007103309.363737-3-allen.lkml@gmail.com

diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.c b/drivers/net/wireless/mediatek/mt7601u/dma.c
index 09f931d4598c2e01e1ae02158b66d500788e2c89..5f99054f535b4d6ae3da175462136da2f4eb024b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt7601u/dma.c
+++ b/drivers/net/wireless/mediatek/mt7601u/dma.c
@@ -212,9 +212,9 @@ out:
        spin_unlock_irqrestore(&dev->rx_lock, flags);
 }
 
-static void mt7601u_rx_tasklet(unsigned long data)
+static void mt7601u_rx_tasklet(struct tasklet_struct *t)
 {
-       struct mt7601u_dev *dev = (struct mt7601u_dev *) data;
+       struct mt7601u_dev *dev = from_tasklet(dev, t, rx_tasklet);
        struct mt7601u_dma_buf_rx *e;
 
        while ((e = mt7601u_rx_get_pending_entry(dev))) {
@@ -266,9 +266,9 @@ out:
        spin_unlock_irqrestore(&dev->tx_lock, flags);
 }
 
-static void mt7601u_tx_tasklet(unsigned long data)
+static void mt7601u_tx_tasklet(struct tasklet_struct *t)
 {
-       struct mt7601u_dev *dev = (struct mt7601u_dev *) data;
+       struct mt7601u_dev *dev = from_tasklet(dev, t, tx_tasklet);
        struct sk_buff_head skbs;
        unsigned long flags;
 
@@ -507,8 +507,8 @@ int mt7601u_dma_init(struct mt7601u_dev *dev)
 {
        int ret = -ENOMEM;
 
-       tasklet_init(&dev->tx_tasklet, mt7601u_tx_tasklet, (unsigned long) dev);
-       tasklet_init(&dev->rx_tasklet, mt7601u_rx_tasklet, (unsigned long) dev);
+       tasklet_setup(&dev->tx_tasklet, mt7601u_tx_tasklet);
+       tasklet_setup(&dev->rx_tasklet, mt7601u_rx_tasklet);
 
        ret = mt7601u_alloc_tx(dev);
        if (ret)