usb: isp1760: Use setup_timer

[deliverable/linux.git] / drivers / usb / host / isp1760-hcd.c

diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index e752c3098f3803823ea2efa26ad27e7c81b42e7f..79261d5127cd28ae1a0f677f03e456caf0d0ae94 100644 (file)
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1359,9 +1359,7 @@ static int isp1760_run(struct usb_hcd *hcd)
        if (retval)
                return retval;
 
-       init_timer(&errata2_timer);
-       errata2_timer.function = errata2_function;
-       errata2_timer.data = (unsigned long) hcd;
+       setup_timer(&errata2_timer, errata2_function, (unsigned long)hcd);
        errata2_timer.expires = jiffies + SLOT_CHECK_PERIOD * HZ / 1000;
        add_timer(&errata2_timer);
 
@@ -1739,7 +1737,7 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
        int retval = 1;
        unsigned long flags;
 
-       /* if !PM_RUNTIME, root hub timers won't get shut down ... */
+       /* if !PM, root hub timers won't get shut down ... */
        if (!HC_IS_RUNNING(hcd->state))
                return 0;