Re: [PATCH] PM: Runtime PM v17 - Platform Device Bus Support

[Paul Mundt <lethal@linux-sh.org>]

Greg?

On Sun, Aug 16, 2009 at 12:21:18PM +0200, Rafael J. Wysocki wrote:
> On Saturday 15 August 2009, Magnus Damm wrote:
> > From: Magnus Damm <damm@igel.co.jp>
> > 
> > This patch adds default Runtime PM callbacks to the dev_pm_ops
> > belonging to the platform bus. The callbacks are weak symbols
> > that architecture specific code can override.
> > 
> > Allows Runtime PM even though CONFIG_PM_SLEEP=n.
> > 
> > Signed-off-by: Magnus Damm <damm@igel.co.jp>
> 
> Thanks for the patch.
> 
> Greg, is it fine with you?
> 
> Rafael
> 
> 
> > ---
> > 
> >  Needed by the SuperH Mobile Runtime PM implementation. Depends on
> >  "PM: Introduce core framework for run-time PM of I/O devices (rev. 17)"
> > 
> >  Changes since 20090812 (v15 -> v17):
> >  - platform_pm_runtime_idle() now returns int
> > 
> >  Changes since 20090807:
> >  - removed pm_runtime_enable()
> > 
> >  Changes since 20090731:
> >  - Based on "Driver Core: Runtime PM callbacks for the Platform Bus V2"
> >  - Reworked to handle CONFIG_PM_SLEEP=n case
> > 
> >  drivers/base/platform.c |   46 +++++++++++++++++++++++++++++++++++++---------
> >  1 file changed, 37 insertions(+), 9 deletions(-)
> > 
> > --- 0001/drivers/base/platform.c
> > +++ work/drivers/base/platform.c	2009-08-15 12:15:38.000000000 +0900
> > @@ -17,6 +17,7 @@
> >  #include <linux/bootmem.h>
> >  #include <linux/err.h>
> >  #include <linux/slab.h>
> > +#include <linux/pm_runtime.h>
> >  
> >  #include "base.h"
> >  
> > @@ -680,6 +681,13 @@ static void platform_pm_complete(struct 
> >  		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)
> > @@ -922,6 +930,31 @@ static int platform_pm_restore_noirq(str
> >  
> >  #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 struct dev_pm_ops platform_dev_pm_ops = {
> >  	.prepare = platform_pm_prepare,
> >  	.complete = platform_pm_complete,
> > @@ -937,22 +970,17 @@ static struct dev_pm_ops platform_dev_pm
> >  	.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);