|
@@ -2558,9 +2558,7 @@ struct usb_hcd *__usb_create_hcd(const struct hc_driver *driver,
|
|
hcd->self.bus_name = bus_name;
|
|
hcd->self.bus_name = bus_name;
|
|
hcd->self.uses_dma = (sysdev->dma_mask != NULL);
|
|
hcd->self.uses_dma = (sysdev->dma_mask != NULL);
|
|
|
|
|
|
- init_timer(&hcd->rh_timer);
|
|
|
|
- hcd->rh_timer.function = rh_timer_func;
|
|
|
|
- hcd->rh_timer.data = (unsigned long) hcd;
|
|
|
|
|
|
+ setup_timer(&hcd->rh_timer, rh_timer_func, (unsigned long)hcd);
|
|
#ifdef CONFIG_PM
|
|
#ifdef CONFIG_PM
|
|
INIT_WORK(&hcd->wakeup_work, hcd_resume_work);
|
|
INIT_WORK(&hcd->wakeup_work, hcd_resume_work);
|
|
#endif
|
|
#endif
|