leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Kees Cook <keescook@chromium.org>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2017-10-24 03:08:03 -07:00 committed by Greg Kroah-Hartman
parent 8e4e276a38
commit 74fef19f66
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/gadget/legacy/zero.c
View File

@ -154,10 +154,11 @@ static struct usb_gadget_strings *dev_strings[] = {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static struct timer_list autoresume_timer; 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; struct usb_gadget *g = cdev->gadget;
/* unconfigured devices can't issue wakeups */ /* 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.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
device_desc.iSerialNumber = strings_dev[USB_GADGET_SERIAL_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"); func_inst_ss = usb_get_function_instance("SourceSink");
if (IS_ERR(func_inst_ss)) if (IS_ERR(func_inst_ss))