summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/zydas
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2020-08-17 12:06:37 +0300
committerKalle Valo <kvalo@codeaurora.org>2020-08-27 16:22:15 +0300
commit26721b02466e396efaca6807b52916478c4f9197 (patch)
treebb69066ff7e26c32add995485ec135ab5a9f4c82 /drivers/net/wireless/zydas
parentd3ccc14dfe9595d5ecd247db27bd66a1343f315a (diff)
downloadlinux-26721b02466e396efaca6807b52916478c4f9197.tar.xz
zd1211rw: 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 fieldd 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-17-allen.cryptic@gmail.com
Diffstat (limited to 'drivers/net/wireless/zydas')
-rw-r--r--drivers/net/wireless/zydas/zd1211rw/zd_usb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
index 65b5985ad402..8b3d248bac6e 100644
--- a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
@@ -1140,9 +1140,9 @@ static void zd_rx_idle_timer_handler(struct work_struct *work)
zd_usb_reset_rx(usb);
}
-static void zd_usb_reset_rx_idle_timer_tasklet(unsigned long param)
+static void zd_usb_reset_rx_idle_timer_tasklet(struct tasklet_struct *t)
{
- struct zd_usb *usb = (struct zd_usb *)param;
+ struct zd_usb *usb = from_tasklet(usb, t, rx.reset_timer_tasklet);
zd_usb_reset_rx_idle_timer(usb);
}
@@ -1178,8 +1178,8 @@ static inline void init_usb_rx(struct zd_usb *usb)
}
ZD_ASSERT(rx->fragment_length == 0);
INIT_DELAYED_WORK(&rx->idle_work, zd_rx_idle_timer_handler);
- rx->reset_timer_tasklet.func = zd_usb_reset_rx_idle_timer_tasklet;
- rx->reset_timer_tasklet.data = (unsigned long)usb;
+ rx->reset_timer_tasklet.func = (void (*)(unsigned long))
+ zd_usb_reset_rx_idle_timer_tasklet;
}
static inline void init_usb_tx(struct zd_usb *usb)