|
@@ -406,26 +406,19 @@ static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
-static int ohci_da8xx_suspend(struct platform_device *pdev,
|
|
|
- pm_message_t message)
|
|
|
+static int ohci_da8xx_suspend(struct platform_device *dev, pm_message_t message)
|
|
|
{
|
|
|
- struct usb_hcd *hcd = platform_get_drvdata(pdev);
|
|
|
+ struct usb_hcd *hcd = platform_get_drvdata(dev);
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
|
|
|
- bool do_wakeup = device_may_wakeup(&pdev->dev);
|
|
|
- int ret;
|
|
|
|
|
|
if (time_before(jiffies, ohci->next_statechange))
|
|
|
msleep(5);
|
|
|
ohci->next_statechange = jiffies;
|
|
|
|
|
|
- ret = ohci_suspend(hcd, do_wakeup);
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
-
|
|
|
ohci_da8xx_clock(0);
|
|
|
hcd->state = HC_STATE_SUSPENDED;
|
|
|
-
|
|
|
- return ret;
|
|
|
+ dev->dev.power.power_state = PMSG_SUSPEND;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static int ohci_da8xx_resume(struct platform_device *dev)
|