diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-26 14:03:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-26 14:03:58 -0800 |
| commit | 14c59dcde6f8a633ccca5abfec8bc79c8bdf7b12 (patch) | |
| tree | 3a4610f2dfa6dab9a37c5222bf206230f8cce0a9 | |
| parent | 82f31ebf61bed3077c9935308e0a4b6c44842c5a (diff) | |
| parent | 2eb1d3f4bcae6c83943214ccb26968a48360db06 (diff) | |
| download | linux-stable-14c59dcde6f8a633ccca5abfec8bc79c8bdf7b12.tar.gz linux-stable-14c59dcde6f8a633ccca5abfec8bc79c8bdf7b12.tar.bz2 linux-stable-14c59dcde6f8a633ccca5abfec8bc79c8bdf7b12.zip | |
Merge branch 'net-func-cast'
Phong Tran says:
====================
Fix -Wcast-function-type usb net drivers
Change log with v1:
- Modify suffix of patch subject.
- Did the checkpatch.pl (remove the space, add a blank line).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/hso.c | 5 | ||||
| -rw-r--r-- | drivers/net/usb/usbnet.c | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 74849da031fa..ca827802f291 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -1214,8 +1214,9 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb) * This needs to be a tasklet otherwise we will * end up recursively calling this function. */ -static void hso_unthrottle_tasklet(struct hso_serial *serial) +static void hso_unthrottle_tasklet(unsigned long data) { + struct hso_serial *serial = (struct hso_serial *)data; unsigned long flags; spin_lock_irqsave(&serial->serial_lock, flags); @@ -1265,7 +1266,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp) /* Force default termio settings */ _hso_serial_set_termios(tty, NULL); tasklet_init(&serial->unthrottle_tasklet, - (void (*)(unsigned long))hso_unthrottle_tasklet, + hso_unthrottle_tasklet, (unsigned long)serial); result = hso_start_serial_device(serial->parent, GFP_KERNEL); if (result) { diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index dde05e2fdc3e..30e511c2c8d0 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1573,6 +1573,13 @@ static void usbnet_bh (struct timer_list *t) } } +static void usbnet_bh_tasklet(unsigned long data) +{ + struct timer_list *t = (struct timer_list *)data; + + usbnet_bh(t); +} + /*------------------------------------------------------------------------- * @@ -1700,7 +1707,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) skb_queue_head_init (&dev->txq); skb_queue_head_init (&dev->done); skb_queue_head_init(&dev->rxq_pause); - dev->bh.func = (void (*)(unsigned long))usbnet_bh; + dev->bh.func = usbnet_bh_tasklet; dev->bh.data = (unsigned long)&dev->delay; INIT_WORK (&dev->kevent, usbnet_deferred_kevent); init_usb_anchor(&dev->deferred); |