1 files changed, 37 insertions, 45 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 0b111e8e444f..0f7d434ce983 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -17,6 +17,7 @@
 #include <linux/bootmem.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 
 #include "base.h"
 
@@ -625,30 +626,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);
@@ -680,6 +657,13 @@ static void platform_pm_complete(struct device *dev)
                 drv->pm->complete(dev);
 }
 
+#else /* !CONFIG_PM_SLEEP */
+
+#define platform_pm_prepare             NULL
+#define platform_pm_complete            NULL
+
+#endif /* !CONFIG_PM_SLEEP */
+
 #ifdef CONFIG_SUSPEND
 
 static int platform_pm_suspend(struct device *dev)
@@ -711,8 +695,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;
@@ -747,8 +729,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;
@@ -794,8 +774,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;
@@ -830,8 +808,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;
@@ -866,8 +842,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;
@@ -902,8 +876,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;
@@ -922,6 +894,31 @@ static int platform_pm_restore_noirq(struct device *dev)
 
 #endif /* !CONFIG_HIBERNATION */
 
+#ifdef CONFIG_PM_RUNTIME
+
+int __weak platform_pm_runtime_suspend(struct device *dev)
+{
+        return -ENOSYS;
+};
+
+int __weak platform_pm_runtime_resume(struct device *dev)
+{
+        return -ENOSYS;
+};
+
+int __weak platform_pm_runtime_idle(struct device *dev)
+{
+        return -ENOSYS;
+};
+
+#else /* !CONFIG_PM_RUNTIME */
+
+#define platform_pm_runtime_suspend NULL
+#define platform_pm_runtime_resume NULL
+#define platform_pm_runtime_idle NULL
+
+#endif /* !CONFIG_PM_RUNTIME */
+
 static const struct dev_pm_ops platform_dev_pm_ops = {
         .prepare = platform_pm_prepare,
         .complete = platform_pm_complete,
@@ -937,22 +934,17 @@ static const struct dev_pm_ops platform_dev_pm_ops = {
         .thaw_noirq = platform_pm_thaw_noirq,
         .poweroff_noirq = platform_pm_poweroff_noirq,
         .restore_noirq = platform_pm_restore_noirq,
+        .runtime_suspend = platform_pm_runtime_suspend,
+        .runtime_resume = platform_pm_runtime_resume,
+        .runtime_idle = platform_pm_runtime_idle,
 };
 
-#define PLATFORM_PM_OPS_PTR     (&platform_dev_pm_ops)
-
-#else /* !CONFIG_PM_SLEEP */
-
-#define PLATFORM_PM_OPS_PTR     NULL
-
-#endif /* !CONFIG_PM_SLEEP */
-
 struct bus_type platform_bus_type = {
         .name           = "platform",
         .dev_attrs      = platform_dev_attrs,
         .match          = platform_match,
         .uevent         = platform_uevent,
-        .pm             = PLATFORM_PM_OPS_PTR,
+        .pm             = &platform_dev_pm_ops,
 };
 EXPORT_SYMBOL_GPL(platform_bus_type);