[patch 2.6.18-rc-mm] PM: platform_bus and late_suspend/early_resume

[patch 2.6.18-rc-mm] PM: platform_bus and late_suspend/early_resume

[David Brownell]

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>

Index: g26/drivers/base/platform.c
===================================================================
--- g26.orig/drivers/base/platform.c	2006-06-28 22:02:04.000000000 -0700
+++ g26/drivers/base/platform.c	2006-08-31 19:36:07.000000000 -0700
@@ -505,12 +505,36 @@ static int platform_match(struct device 
 	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	= platform_suspend_late,
+	.resume		= platform_resume_early,
 	.resume		= platform_resume,
 };
 EXPORT_SYMBOL_GPL(platform_bus_type);
Index: g26/include/linux/platform_device.h
===================================================================
--- g26.orig/include/linux/platform_device.h	2006-08-31 19:30:33.000000000 -0700
+++ g26/include/linux/platform_device.h	2006-08-31 19:30:46.000000000 -0700
@@ -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;
 };

Re: [patch 2.6.18-rc-mm] PM: platform_bus and late_suspend/early_resume

[Greg KH]

On Fri, Sep 01, 2006 at 08:51:14PM -0700, David Brownell wrote:
> 
> 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?

I don't think we need it anymore, but you should ask the cpu people,
they seem to love sysdev for some odd reason (probably because they
finally get to create a sysfs file, like all the cool driver kids have
been doing for years...)

If you get their ok, I'm fine with getting rid of it.

thanks,

greg k-h