|
@@ -2168,8 +2168,9 @@ static int __devexit musb_remove(struct platform_device *pdev)
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
|
-static int musb_suspend(struct platform_device *pdev, pm_message_t message)
|
|
|
+static int musb_suspend(struct device *dev)
|
|
|
{
|
|
|
+ struct platform_device *pdev = to_platform_device(dev);
|
|
|
unsigned long flags;
|
|
|
struct musb *musb = dev_to_musb(&pdev->dev);
|
|
|
|
|
@@ -2196,8 +2197,9 @@ static int musb_suspend(struct platform_device *pdev, pm_message_t message)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int musb_resume_early(struct platform_device *pdev)
|
|
|
+static int musb_resume_noirq(struct device *dev)
|
|
|
{
|
|
|
+ struct platform_device *pdev = to_platform_device(dev);
|
|
|
struct musb *musb = dev_to_musb(&pdev->dev);
|
|
|
|
|
|
if (!musb->clock)
|
|
@@ -2215,9 +2217,14 @@ static int musb_resume_early(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static struct dev_pm_ops musb_dev_pm_ops = {
|
|
|
+ .suspend = musb_suspend,
|
|
|
+ .resume_noirq = musb_resume_noirq,
|
|
|
+};
|
|
|
+
|
|
|
+#define MUSB_DEV_PM_OPS (&musb_dev_pm_ops)
|
|
|
#else
|
|
|
-#define musb_suspend NULL
|
|
|
-#define musb_resume_early NULL
|
|
|
+#define MUSB_DEV_PM_OPS NULL
|
|
|
#endif
|
|
|
|
|
|
static struct platform_driver musb_driver = {
|
|
@@ -2225,11 +2232,10 @@ static struct platform_driver musb_driver = {
|
|
|
.name = (char *)musb_driver_name,
|
|
|
.bus = &platform_bus_type,
|
|
|
.owner = THIS_MODULE,
|
|
|
+ .pm = MUSB_DEV_PM_OPS,
|
|
|
},
|
|
|
.remove = __devexit_p(musb_remove),
|
|
|
.shutdown = musb_shutdown,
|
|
|
- .suspend = musb_suspend,
|
|
|
- .resume_early = musb_resume_early,
|
|
|
};
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|