iwlegacy: 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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200817090637.26887-10-allen.cryptic@gmail.com

diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
index e3f79d6..1fdc751 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
@@ -1374,9 +1374,9 @@ il3945_dump_nic_error_log(struct il_priv *il)
 }
 
 static void
-il3945_irq_tasklet(unsigned long data)
+il3945_irq_tasklet(struct tasklet_struct *t)
 {
-       struct il_priv *il = (struct il_priv *)data;
+       struct il_priv *il = from_tasklet(il, t, irq_tasklet);
        u32 inta, handled = 0;
        u32 inta_fh;
        unsigned long flags;
@@ -3399,9 +3399,7 @@ il3945_setup_deferred_work(struct il_priv *il)
 
        timer_setup(&il->watchdog, il_bg_watchdog, 0);
 
-       tasklet_init(&il->irq_tasklet,
-                    il3945_irq_tasklet,
-                    (unsigned long)il);
+       tasklet_setup(&il->irq_tasklet, il3945_irq_tasklet);
 }
 
 static void

diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
index 9295344..ce3e34c 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -4344,9 +4344,9 @@ il4965_synchronize_irq(struct il_priv *il)
 }
 
 static void
-il4965_irq_tasklet(unsigned long data)
+il4965_irq_tasklet(struct tasklet_struct *t)
 {
-       struct il_priv *il = (struct il_priv *)data;
+       struct il_priv *il = from_tasklet(il, t, irq_tasklet);
        u32 inta, handled = 0;
        u32 inta_fh;
        unsigned long flags;
@@ -6238,9 +6238,7 @@ il4965_setup_deferred_work(struct il_priv *il)
 
        timer_setup(&il->watchdog, il_bg_watchdog, 0);
 
-       tasklet_init(&il->irq_tasklet,
-                    il4965_irq_tasklet,
-                    (unsigned long)il);
+       tasklet_setup(&il->irq_tasklet, il4965_irq_tasklet);
 }
 
 static void