Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74fef19f authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

usb: gadget: zero: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Adds a static tracking variable to
match the timer global.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e4e276a

drivers/usb/gadget/legacy/zero.c

+5 −3
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ static struct usb_gadget_strings *dev_strings[] = { 
/*-------------------------------------------------------------------------*/



static struct timer_list	autoresume_timer;

static struct usb_composite_dev *autoresume_cdev;



static void zero_autoresume(unsigned long _c)

static void zero_autoresume(struct timer_list *unused)

{

	struct usb_composite_dev	*cdev = (void *)_c;

	struct usb_composite_dev	*cdev = autoresume_cdev;

	struct usb_gadget		*g = cdev->gadget;



	/* unconfigured devices can't issue wakeups */
@@ -282,7 +283,8 @@ static int zero_bind(struct usb_composite_dev *cdev) 
	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;

	device_desc.iSerialNumber = strings_dev[USB_GADGET_SERIAL_IDX].id;



	setup_timer(&autoresume_timer, zero_autoresume, (unsigned long) cdev);

	autoresume_cdev = cdev;

	timer_setup(&autoresume_timer, zero_autoresume, 0);



	func_inst_ss = usb_get_function_instance("SourceSink");

	if (IS_ERR(func_inst_ss))