2 files changed, 6 insertions, 40 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;