PM: platform_bus and late_suspend/early_resume

Teach platform_bus about the new suspend_late/resume_early PM calls,
issued with IRQs off.  Do we really need sysdev and friends any more,
or can janitors start switching its users over to platform_device so
we can do a minor code-ectomy?

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 30 insertions, 2 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 2b8755db76c6..940ce41f1887 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -505,12 +505,36 @@ static int platform_match(struct device * dev, struct device_driver * drv)
         return (strncmp(pdev->name, drv->name, BUS_ID_SIZE) == 0);
 }
 
-static int platform_suspend(struct device * dev, pm_message_t state)
+static int platform_suspend(struct device *dev, pm_message_t mesg)
 {
         int ret = 0;
 
         if (dev->driver && dev->driver->suspend)
-                ret = dev->driver->suspend(dev, state);
+                ret = dev->driver->suspend(dev, mesg);
+
+        return ret;
+}
+
+static int platform_suspend_late(struct device *dev, pm_message_t mesg)
+{
+        struct platform_driver *drv = to_platform_driver(dev->driver);
+        struct platform_device *pdev = container_of(dev, struct platform_device, dev);
+        int ret = 0;
+
+        if (dev->driver && drv->suspend_late)
+                ret = drv->suspend_late(pdev, mesg);
+
+        return ret;
+}
+
+static int platform_resume_early(struct device *dev)
+{
+        struct platform_driver *drv = to_platform_driver(dev->driver);
+        struct platform_device *pdev = container_of(dev, struct platform_device, dev);
+        int ret = 0;
+
+        if (dev->driver && drv->resume_early)
+                ret = drv->resume_early(pdev);
 
         return ret;
 }
@@ -531,6 +555,8 @@ struct bus_type platform_bus_type = {
         .match          = platform_match,
         .uevent         = platform_uevent,
         .suspend        = platform_suspend,
+        .suspend_late   = platform_suspend_late,
+        .resume_early   = platform_resume_early,
         .resume         = platform_resume,
 };
 EXPORT_SYMBOL_GPL(platform_bus_type);
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 782090c68932..29cd6dee13db 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -49,6 +49,8 @@ struct platform_driver {
         int (*remove)(struct platform_device *);
         void (*shutdown)(struct platform_device *);
         int (*suspend)(struct platform_device *, pm_message_t state);
+        int (*suspend_late)(struct platform_device *, pm_message_t state);
+        int (*resume_early)(struct platform_device *);
         int (*resume)(struct platform_device *);
         struct device_driver driver;
 };