carl9170: 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 <allen.lkml@gmail.com>
Acked-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200817090637.26887-4-allen.cryptic@gmail.com

diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index ead79335823a5e7ded2255080e7f0d37ea1354ae..e4eb666c6eea41ab51c5cf8c0c5e60a9db5f4ad7 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -377,9 +377,9 @@ void carl9170_usb_handle_tx_err(struct ar9170 *ar)
        }
 }
 
-static void carl9170_usb_tasklet(unsigned long data)
+static void carl9170_usb_tasklet(struct tasklet_struct *t)
 {
-       struct ar9170 *ar = (struct ar9170 *) data;
+       struct ar9170 *ar = from_tasklet(ar, t, usb_tasklet);
 
        if (!IS_INITIALIZED(ar))
                return;
@@ -1082,8 +1082,7 @@ static int carl9170_usb_probe(struct usb_interface *intf,
        init_completion(&ar->cmd_wait);
        init_completion(&ar->fw_boot_wait);
        init_completion(&ar->fw_load_wait);
-       tasklet_init(&ar->usb_tasklet, carl9170_usb_tasklet,
-                    (unsigned long)ar);
+       tasklet_setup(&ar->usb_tasklet, carl9170_usb_tasklet);
 
        atomic_set(&ar->tx_cmd_urbs, 0);
        atomic_set(&ar->tx_anch_urbs, 0);