xhci-mem: Use setup_timer

commit 9e08a03dc12a41ce695559f8c6d999aaf245b8be upstream.

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.data = d;
-t.function = f;
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 9e6e83bc5d4c517feeacda1b5596372bfc6dbbec..7b56111c6c7aba6d8240531fe242817d091f70ca 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -833,9 +833,8 @@ void xhci_free_stream_info(struct xhci_hcd *xhci,
 static void xhci_init_endpoint_timer(struct xhci_hcd *xhci,
                struct xhci_virt_ep *ep)
 {
-       init_timer(&ep->stop_cmd_timer);
-       ep->stop_cmd_timer.data = (unsigned long) ep;
-       ep->stop_cmd_timer.function = xhci_stop_endpoint_command_watchdog;
+       setup_timer(&ep->stop_cmd_timer, xhci_stop_endpoint_command_watchdog,
+                   (unsigned long)ep);
        ep->xhci = xhci;
 }
 
@@ -2508,9 +2507,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
        xhci_print_ir_set(xhci, 0);
 
        /* init command timeout timer */
-       init_timer(&xhci->cmd_timer);
-       xhci->cmd_timer.data = (unsigned long) xhci;
-       xhci->cmd_timer.function = xhci_handle_command_timeout;
+       setup_timer(&xhci->cmd_timer, xhci_handle_command_timeout,
+                   (unsigned long)xhci);
 
        /*
         * XXX: Might need to set the Interrupter Moderation Register to