8 files changed, 79 insertions, 81 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 81cb01bfc356..ae5c4aa6d269 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -628,30 +628,6 @@ static int platform_legacy_suspend(struct device *dev, pm_message_t mesg)
         return ret;
 }
 
-static int platform_legacy_suspend_late(struct device *dev, pm_message_t mesg)
-{
-        struct platform_driver *pdrv = to_platform_driver(dev->driver);
-        struct platform_device *pdev = to_platform_device(dev);
-        int ret = 0;
-
-        if (dev->driver && pdrv->suspend_late)
-                ret = pdrv->suspend_late(pdev, mesg);
-
-        return ret;
-}
-
-static int platform_legacy_resume_early(struct device *dev)
-{
-        struct platform_driver *pdrv = to_platform_driver(dev->driver);
-        struct platform_device *pdev = to_platform_device(dev);
-        int ret = 0;
-
-        if (dev->driver && pdrv->resume_early)
-                ret = pdrv->resume_early(pdev);
-
-        return ret;
-}
-
 static int platform_legacy_resume(struct device *dev)
 {
         struct platform_driver *pdrv = to_platform_driver(dev->driver);
@@ -714,8 +690,6 @@ static int platform_pm_suspend_noirq(struct device *dev)
         if (drv->pm) {
                 if (drv->pm->suspend_noirq)
                         ret = drv->pm->suspend_noirq(dev);
-        } else {
-                ret = platform_legacy_suspend_late(dev, PMSG_SUSPEND);
         }
 
         return ret;
@@ -750,8 +724,6 @@ static int platform_pm_resume_noirq(struct device *dev)
         if (drv->pm) {
                 if (drv->pm->resume_noirq)
                         ret = drv->pm->resume_noirq(dev);
-        } else {
-                ret = platform_legacy_resume_early(dev);
         }
 
         return ret;
@@ -797,8 +769,6 @@ static int platform_pm_freeze_noirq(struct device *dev)
         if (drv->pm) {
                 if (drv->pm->freeze_noirq)
                         ret = drv->pm->freeze_noirq(dev);
-        } else {
-                ret = platform_legacy_suspend_late(dev, PMSG_FREEZE);
         }
 
         return ret;
@@ -833,8 +803,6 @@ static int platform_pm_thaw_noirq(struct device *dev)
         if (drv->pm) {
                 if (drv->pm->thaw_noirq)
                         ret = drv->pm->thaw_noirq(dev);
-        } else {
-                ret = platform_legacy_resume_early(dev);
         }
 
         return ret;
@@ -869,8 +837,6 @@ static int platform_pm_poweroff_noirq(struct device *dev)
         if (drv->pm) {
                 if (drv->pm->poweroff_noirq)
                         ret = drv->pm->poweroff_noirq(dev);
-        } else {
-                ret = platform_legacy_suspend_late(dev, PMSG_HIBERNATE);
         }
 
         return ret;
@@ -905,8 +871,6 @@ static int platform_pm_restore_noirq(struct device *dev)
         if (drv->pm) {
                 if (drv->pm->restore_noirq)
                         ret = drv->pm->restore_noirq(dev);
-        } else {
-                ret = platform_legacy_resume_early(dev);
         }
 
         return ret;
@@ -925,7 +889,7 @@ static int platform_pm_restore_noirq(struct device *dev)
 
 #endif /* !CONFIG_HIBERNATION */
 
-static struct dev_pm_ops platform_dev_pm_ops = {
+static const struct dev_pm_ops platform_dev_pm_ops = {
         .prepare = platform_pm_prepare,
         .complete = platform_pm_complete,
         .suspend = platform_pm_suspend,
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 58a3e572f2c9..1b1a786b7dec 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -157,8 +157,9 @@ void device_pm_move_last(struct device *dev)
  *      @ops:   PM operations to choose from.
  *      @state: PM transition of the system being carried out.
  */
-static int pm_op(struct device *dev, struct dev_pm_ops *ops,
-                        pm_message_t state)
+static int pm_op(struct device *dev,
+                 const struct dev_pm_ops *ops,
+                 pm_message_t state)
 {
         int error = 0;
 
@@ -220,7 +221,8 @@ static int pm_op(struct device *dev, struct dev_pm_ops *ops,
  *      The operation is executed with interrupts disabled by the only remaining
  *      functional CPU in the system.
  */
-static int pm_noirq_op(struct device *dev, struct dev_pm_ops *ops,
+static int pm_noirq_op(struct device *dev,
+                        const struct dev_pm_ops *ops,
                         pm_message_t state)
 {
         int error = 0;
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 98c9a847bf51..933c143b6a74 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1399,8 +1399,9 @@ static void dw_shutdown(struct platform_device *pdev)
         clk_disable(dw->clk);
 }
 
-static int dw_suspend_late(struct platform_device *pdev, pm_message_t mesg)
+static int dw_suspend_noirq(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct dw_dma   *dw = platform_get_drvdata(pdev);
 
         dw_dma_off(platform_get_drvdata(pdev));
@@ -1408,23 +1409,27 @@ static int dw_suspend_late(struct platform_device *pdev, pm_message_t mesg)
         return 0;
 }
 
-static int dw_resume_early(struct platform_device *pdev)
+static int dw_resume_noirq(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct dw_dma   *dw = platform_get_drvdata(pdev);
 
         clk_enable(dw->clk);
         dma_writel(dw, CFG, DW_CFG_DMA_EN);
         return 0;
-
 }
 
+static struct dev_pm_ops dw_dev_pm_ops = {
+        .suspend_noirq = dw_suspend_noirq,
+        .resume_noirq = dw_resume_noirq,
+};
+
 static struct platform_driver dw_driver = {
         .remove         = __exit_p(dw_remove),
         .shutdown       = dw_shutdown,
-        .suspend_late   = dw_suspend_late,
-        .resume_early   = dw_resume_early,
         .driver = {
                 .name   = "dw_dmac",
+                .pm     = &dw_dev_pm_ops,
         },
 };
 
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index 88dab52926f4..7837930146a4 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -1291,17 +1291,18 @@ static void txx9dmac_shutdown(struct platform_device *pdev)
         txx9dmac_off(ddev);
 }
 
-static int txx9dmac_suspend_late(struct platform_device *pdev,
-                                 pm_message_t mesg)
+static int txx9dmac_suspend_noirq(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
 
         txx9dmac_off(ddev);
         return 0;
 }
 
-static int txx9dmac_resume_early(struct platform_device *pdev)
+static int txx9dmac_resume_noirq(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
         struct txx9dmac_platform_data *pdata = pdev->dev.platform_data;
         u32 mcr;
@@ -1314,6 +1315,11 @@ static int txx9dmac_resume_early(struct platform_device *pdev)
 
 }
 
+static struct dev_pm_ops txx9dmac_dev_pm_ops = {
+        .suspend_noirq = txx9dmac_suspend_noirq,
+        .resume_noirq = txx9dmac_resume_noirq,
+};
+
 static struct platform_driver txx9dmac_chan_driver = {
         .remove         = __exit_p(txx9dmac_chan_remove),
         .driver = {
@@ -1324,10 +1330,9 @@ static struct platform_driver txx9dmac_chan_driver = {
 static struct platform_driver txx9dmac_driver = {
         .remove         = __exit_p(txx9dmac_remove),
         .shutdown       = txx9dmac_shutdown,
-        .suspend_late   = txx9dmac_suspend_late,
-        .resume_early   = txx9dmac_resume_early,
         .driver = {
                 .name   = "txx9dmac",
+                .pm     = &txx9dmac_dev_pm_ops,
         },
 };
 
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 762e1e530882..049555777f67 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1134,35 +1134,44 @@ static int __exit i2c_pxa_remove(struct platform_device *dev)
 }
 
 #ifdef CONFIG_PM
-static int i2c_pxa_suspend_late(struct platform_device *dev, pm_message_t state)
+static int i2c_pxa_suspend_noirq(struct device *dev)
 {
-        struct pxa_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct pxa_i2c *i2c = platform_get_drvdata(pdev);
+
         clk_disable(i2c->clk);
+
         return 0;
 }
 
-static int i2c_pxa_resume_early(struct platform_device *dev)
+static int i2c_pxa_resume_noirq(struct device *dev)
 {
-        struct pxa_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct pxa_i2c *i2c = platform_get_drvdata(pdev);
 
         clk_enable(i2c->clk);
         i2c_pxa_reset(i2c);
 
         return 0;
 }
+
+static struct dev_pm_ops i2c_pxa_dev_pm_ops = {
+        .suspend_noirq = i2c_pxa_suspend_noirq,
+        .resume_noirq = i2c_pxa_resume_noirq,
+};
+
+#define I2C_PXA_DEV_PM_OPS (&i2c_pxa_dev_pm_ops)
 #else
-#define i2c_pxa_suspend_late NULL
-#define i2c_pxa_resume_early NULL
+#define I2C_PXA_DEV_PM_OPS NULL
 #endif
 
 static struct platform_driver i2c_pxa_driver = {
         .probe          = i2c_pxa_probe,
         .remove         = __exit_p(i2c_pxa_remove),
-        .suspend_late   = i2c_pxa_suspend_late,
-        .resume_early   = i2c_pxa_resume_early,
         .driver         = {
                 .name   = "pxa2xx-i2c",
                 .owner  = THIS_MODULE,
+                .pm     = I2C_PXA_DEV_PM_OPS,
         },
         .id_table       = i2c_pxa_id_table,
 };
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 8f42a4536cdf..3be0d6a4d630 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -951,17 +951,20 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int s3c24xx_i2c_suspend_late(struct platform_device *dev,
-                                    pm_message_t msg)
+static int s3c24xx_i2c_suspend_noirq(struct device *dev)
 {
-        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
+
         i2c->suspended = 1;
+
         return 0;
 }
 
-static int s3c24xx_i2c_resume(struct platform_device *dev)
+static int s3c24xx_i2c_resume(struct device *dev)
 {
-        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
 
         i2c->suspended = 0;
         s3c24xx_i2c_init(i2c);
@@ -969,9 +972,14 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
         return 0;
 }
 
+static struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
+        .suspend_noirq = s3c24xx_i2c_suspend_noirq,
+        .resume = s3c24xx_i2c_resume,
+};
+
+#define S3C24XX_DEV_PM_OPS (&s3c24xx_i2c_dev_pm_ops)
 #else
-#define s3c24xx_i2c_suspend_late NULL
-#define s3c24xx_i2c_resume NULL
+#define S3C24XX_DEV_PM_OPS NULL
 #endif
 
 /* device driver for platform bus bits */
@@ -990,12 +998,11 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);
 static struct platform_driver s3c24xx_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
-        .suspend_late   = s3c24xx_i2c_suspend_late,
-        .resume         = s3c24xx_i2c_resume,
         .id_table       = s3c24xx_driver_ids,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "s3c-i2c",
+                .pm     = S3C24XX_DEV_PM_OPS,
         },
 };
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index d76c4c85367e..0c2ea44ae5e1 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -575,7 +575,7 @@ static void pci_pm_complete(struct device *dev)
 static int pci_pm_suspend(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_SUSPEND);
@@ -613,7 +613,7 @@ static int pci_pm_suspend(struct device *dev)
 static int pci_pm_suspend_noirq(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
@@ -672,7 +672,7 @@ static int pci_pm_resume_noirq(struct device *dev)
 static int pci_pm_resume(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         /*
@@ -711,7 +711,7 @@ static int pci_pm_resume(struct device *dev)
 static int pci_pm_freeze(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_FREEZE);
@@ -780,7 +780,7 @@ static int pci_pm_thaw_noirq(struct device *dev)
 static int pci_pm_thaw(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
@@ -799,7 +799,7 @@ static int pci_pm_thaw(struct device *dev)
 static int pci_pm_poweroff(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_HIBERNATE);
@@ -872,7 +872,7 @@ static int pci_pm_restore_noirq(struct device *dev)
 static int pci_pm_restore(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         /*
@@ -910,7 +910,7 @@ static int pci_pm_restore(struct device *dev)
 
 #endif /* !CONFIG_HIBERNATION */
 
-struct dev_pm_ops pci_dev_pm_ops = {
+const struct dev_pm_ops pci_dev_pm_ops = {
         .prepare = pci_pm_prepare,
         .complete = pci_pm_complete,
         .suspend = pci_pm_suspend,
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 554a414f65d1..1191928902f4 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -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,
 };
 
 /*-------------------------------------------------------------------------*/