Commit 14c59dcd authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 82f31ebf 2eb1d3f4

drivers/net/usb/hso.c

+3 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/net/usb/usbnet.c

+8 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE