Commit 6626a026 authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'net-usbnet-convert-to-new-tasklet-api'

Emil Renner Berthing says:

====================
net: usbnet: convert to new tasklet API

This converts the usbnet driver to use the new tasklet API introduced in
commit 12cc923f ("tasklet: Introduce new initialization API")

It is split into two commits for ease of reviewing.
====================

Link: https://lore.kernel.org/r/20210123173221.5855-1-esmil@mailme.dkSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3e4715ec c955e329
...@@ -1539,11 +1539,11 @@ static void usbnet_bh (struct timer_list *t) ...@@ -1539,11 +1539,11 @@ static void usbnet_bh (struct timer_list *t)
} }
} }
static void usbnet_bh_tasklet(unsigned long data) static void usbnet_bh_tasklet(struct tasklet_struct *t)
{ {
struct timer_list *t = (struct timer_list *)data; struct usbnet *dev = from_tasklet(dev, t, bh);
usbnet_bh(t); usbnet_bh(&dev->delay);
} }
...@@ -1673,8 +1673,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) ...@@ -1673,8 +1673,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
skb_queue_head_init (&dev->txq); skb_queue_head_init (&dev->txq);
skb_queue_head_init (&dev->done); skb_queue_head_init (&dev->done);
skb_queue_head_init(&dev->rxq_pause); skb_queue_head_init(&dev->rxq_pause);
dev->bh.func = usbnet_bh_tasklet; tasklet_setup(&dev->bh, usbnet_bh_tasklet);
dev->bh.data = (unsigned long)&dev->delay;
INIT_WORK (&dev->kevent, usbnet_deferred_kevent); INIT_WORK (&dev->kevent, usbnet_deferred_kevent);
init_usb_anchor(&dev->deferred); init_usb_anchor(&dev->deferred);
timer_setup(&dev->delay, usbnet_bh, 0); timer_setup(&dev->delay, usbnet_bh, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment