Skip to content

Commit

Permalink
wireless: zydas: convert tasklets to use new tasklet_setup() API
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Allen Pais authored and intel-lab-lkp committed Aug 17, 2020
1 parent b985c52 commit b1c5065
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/wireless/zydas/zd1211rw/zd_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b1c5065

Please sign in to comment.