| Message ID | 20220107181723.54392-5-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | DEV_PM_OPS macros rework v3 | expand |
On Fri, 7 Jan 2022 at 19:17, Paul Cercueil <paul@crapouillou.net> wrote: > > A lot of drivers create a dev_pm_ops struct with the system sleep > suspend/resume callbacks set to pm_runtime_force_suspend() and > pm_runtime_force_resume(). > > These drivers can now use the DEFINE_RUNTIME_DEV_PM_OPS() macro, which > will use pm_runtime_force_{suspend,resume}() as the system sleep > callbacks, while having the same dead code removal characteristic that > is already provided by DEFINE_SIMPLE_DEV_PM_OPS(). > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > > Notes: > v2-v3: No change > > include/linux/pm.h | 3 ++- > include/linux/pm_runtime.h | 14 ++++++++++++++ > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/include/linux/pm.h b/include/linux/pm.h > index 8279af2c538a..f7d2be686359 100644 > --- a/include/linux/pm.h > +++ b/include/linux/pm.h > @@ -414,7 +414,8 @@ const struct dev_pm_ops __maybe_unused name = { \ > * .resume_early(), to the same routines as .runtime_suspend() and > * .runtime_resume(), respectively (and analogously for hibernation). > * > - * Deprecated. You most likely don't want this macro. > + * Deprecated. You most likely don't want this macro. Use > + * DEFINE_RUNTIME_DEV_PM_OPS() instead. > */ > #define UNIVERSAL_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \ > const struct dev_pm_ops __maybe_unused name = { \ > diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h > index 016de5776b6d..4af454d29281 100644 > --- a/include/linux/pm_runtime.h > +++ b/include/linux/pm_runtime.h > @@ -22,6 +22,20 @@ > usage_count */ > #define RPM_AUTO 0x08 /* Use autosuspend_delay */ > > +/* > + * Use this for defining a set of PM operations to be used in all situations > + * (system suspend, hibernation or runtime PM). > + * > + * Note that the behaviour differs from the deprecated UNIVERSAL_DEV_PM_OPS() > + * macro, which uses the provided callbacks for both runtime PM and system > + * sleep, while DEFINE_RUNTIME_DEV_PM_OPS() uses pm_runtime_force_suspend() > + * and pm_runtime_force_resume() for its system sleep callbacks. > + */ > +#define DEFINE_RUNTIME_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \ > + _DEFINE_DEV_PM_OPS(name, pm_runtime_force_suspend, \ > + pm_runtime_force_resume, suspend_fn, \ > + resume_fn, idle_fn) > + > #ifdef CONFIG_PM > extern struct workqueue_struct *pm_wq; > > -- > 2.34.1 >
diff --git a/include/linux/pm.h b/include/linux/pm.h index 8279af2c538a..f7d2be686359 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -414,7 +414,8 @@ const struct dev_pm_ops __maybe_unused name = { \ * .resume_early(), to the same routines as .runtime_suspend() and * .runtime_resume(), respectively (and analogously for hibernation). * - * Deprecated. You most likely don't want this macro. + * Deprecated. You most likely don't want this macro. Use + * DEFINE_RUNTIME_DEV_PM_OPS() instead. */ #define UNIVERSAL_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \ const struct dev_pm_ops __maybe_unused name = { \ diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 016de5776b6d..4af454d29281 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -22,6 +22,20 @@ usage_count */ #define RPM_AUTO 0x08 /* Use autosuspend_delay */ +/* + * Use this for defining a set of PM operations to be used in all situations + * (system suspend, hibernation or runtime PM). + * + * Note that the behaviour differs from the deprecated UNIVERSAL_DEV_PM_OPS() + * macro, which uses the provided callbacks for both runtime PM and system + * sleep, while DEFINE_RUNTIME_DEV_PM_OPS() uses pm_runtime_force_suspend() + * and pm_runtime_force_resume() for its system sleep callbacks. + */ +#define DEFINE_RUNTIME_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \ + _DEFINE_DEV_PM_OPS(name, pm_runtime_force_suspend, \ + pm_runtime_force_resume, suspend_fn, \ + resume_fn, idle_fn) + #ifdef CONFIG_PM extern struct workqueue_struct *pm_wq;
A lot of drivers create a dev_pm_ops struct with the system sleep suspend/resume callbacks set to pm_runtime_force_suspend() and pm_runtime_force_resume(). These drivers can now use the DEFINE_RUNTIME_DEV_PM_OPS() macro, which will use pm_runtime_force_{suspend,resume}() as the system sleep callbacks, while having the same dead code removal characteristic that is already provided by DEFINE_SIMPLE_DEV_PM_OPS(). Signed-off-by: Paul Cercueil <paul@crapouillou.net> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- Notes: v2-v3: No change include/linux/pm.h | 3 ++- include/linux/pm_runtime.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)