lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] pxa: update ohci-pxa27x.c to use 'struct dev_pm_ops'

Browse Source 
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Mike Rapoport
2009-07-21 17:49:39 +03:00
committed by Eric Miao
parent bf56c751fa
commit b7f3f59b48
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/usb/host/ohci-pxa27x.c
View File

@@ -477,25 +477,25 @@ static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_t state) static int ohci_hcd_pxa27x_drv_suspend(struct device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = dev_get_drvdata(dev);
struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd); struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
if (time_before(jiffies, ohci->ohci.next_statechange)) if (time_before(jiffies, ohci->ohci.next_statechange))
msleep(5); msleep(5);
ohci->ohci.next_statechange = jiffies; ohci->ohci.next_statechange = jiffies;
pxa27x_stop_hc(ohci, &pdev->dev); pxa27x_stop_hc(ohci, dev);
hcd->state = HC_STATE_SUSPENDED; hcd->state = HC_STATE_SUSPENDED;
return 0; return 0;
} }
static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev) static int ohci_hcd_pxa27x_drv_resume(struct device *dev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = dev_get_drvdata(dev);
struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd); struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
int status; int status;
@@ -503,12 +503,17 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
msleep(5); msleep(5);
ohci->ohci.next_statechange = jiffies; ohci->ohci.next_statechange = jiffies;
if ((status = pxa27x_start_hc(ohci, &pdev->dev)) < 0) if ((status = pxa27x_start_hc(ohci, dev)) < 0)
return status; return status;
ohci_finish_controller_resume(hcd); ohci_finish_controller_resume(hcd);
return 0; return 0;
} }
static struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
.suspend = ohci_hcd_pxa27x_drv_suspend,
.resume = ohci_hcd_pxa27x_drv_resume,
};
#endif #endif
/* work with hotplug and coldplug */ /* work with hotplug and coldplug */
@@ -518,13 +523,12 @@ static struct platform_driver ohci_hcd_pxa27x_driver = {
.probe = ohci_hcd_pxa27x_drv_probe, .probe = ohci_hcd_pxa27x_drv_probe,
.remove = ohci_hcd_pxa27x_drv_remove, .remove = ohci_hcd_pxa27x_drv_remove,
.shutdown = usb_hcd_platform_shutdown, .shutdown = usb_hcd_platform_shutdown,
#ifdef CONFIG_PM
.suspend = ohci_hcd_pxa27x_drv_suspend,
.resume = ohci_hcd_pxa27x_drv_resume,
#endif
.driver = { .driver = {
.name = "pxa27x-ohci", .name = "pxa27x-ohci",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &ohci_hcd_pxa27x_pm_ops,
#endif
}, },
}; };