usb: oxu210hp-hcd: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:53 +0000 (15:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jan 2015 20:17:24 +0000 (12:17 -0800)
Convert a call to init_timer and accompanying intializations of
the timer's data and function fields to a call to setup_timer.

A simplified version of the semantic match that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression t,f,d;
@@

-init_timer(&t);
+setup_timer(&t,f,d);
-t.function = f;
-t.data = d;
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/oxu210hp-hcd.c

index 036924e640f55fe6472ababc2aa54d5240dbb29e..ea0ecbcaddc63472755a6f8b6f477dc597b857ad 100644 (file)
@@ -2598,9 +2598,7 @@ static int oxu_hcd_init(struct usb_hcd *hcd)
 
        spin_lock_init(&oxu->lock);
 
-       init_timer(&oxu->watchdog);
-       oxu->watchdog.function = oxu_watchdog;
-       oxu->watchdog.data = (unsigned long) oxu;
+       setup_timer(&oxu->watchdog, oxu_watchdog, (unsigned long)oxu);
 
        /*
         * hw default: 1K periodic list heads, one per frame.