mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
PM: core: Remove DEFINE_UNIVERSAL_DEV_PM_OPS() macro
The deprecated UNIVERSAL_DEV_PM_OPS() macro uses the provided callbacks for both runtime PM and system sleep, which is very likely to be a mistake, as a system sleep can be triggered while a given device is already PM-suspended, which would cause the suspend callback to be called twice. The amount of users of UNIVERSAL_DEV_PM_OPS() is also tiny (16 occurences) compared to the number of places where SET_SYSTEM_SLEEP_PM_OPS() is used with pm_runtime_force_suspend() and pm_runtime_force_resume(), which makes me think that none of these cases are actually valid. As the new macro DEFINE_UNIVERSAL_DEV_PM_OPS() which was introduced to replace UNIVERSAL_DEV_PM_OPS() is currently unused, remove it before someone starts to use it in yet another invalid case. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
committed by
Rafael J. Wysocki
parent
b35b6d4d71
commit
3f4b32511a
@@ -366,6 +366,12 @@ static const struct dev_pm_ops name = { \
|
|||||||
SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Deprecated. Use DEFINE_SIMPLE_DEV_PM_OPS() instead. */
|
||||||
|
#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
|
||||||
|
const struct dev_pm_ops __maybe_unused name = { \
|
||||||
|
SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Use this for defining a set of PM operations to be used in all situations
|
* Use this for defining a set of PM operations to be used in all situations
|
||||||
* (system suspend, hibernation or runtime PM).
|
* (system suspend, hibernation or runtime PM).
|
||||||
@@ -378,20 +384,9 @@ static const struct dev_pm_ops name = { \
|
|||||||
* suspend and "early" resume callback pointers, .suspend_late() and
|
* suspend and "early" resume callback pointers, .suspend_late() and
|
||||||
* .resume_early(), to the same routines as .runtime_suspend() and
|
* .resume_early(), to the same routines as .runtime_suspend() and
|
||||||
* .runtime_resume(), respectively (and analogously for hibernation).
|
* .runtime_resume(), respectively (and analogously for hibernation).
|
||||||
|
*
|
||||||
|
* Deprecated. You most likely don't want this macro.
|
||||||
*/
|
*/
|
||||||
#define DEFINE_UNIVERSAL_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \
|
|
||||||
static const struct dev_pm_ops name = { \
|
|
||||||
SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
|
||||||
RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Deprecated. Use DEFINE_SIMPLE_DEV_PM_OPS() instead. */
|
|
||||||
#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
|
|
||||||
const struct dev_pm_ops __maybe_unused name = { \
|
|
||||||
SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Deprecated. Use DEFINE_UNIVERSAL_DEV_PM_OPS() instead. */
|
|
||||||
#define UNIVERSAL_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \
|
#define UNIVERSAL_DEV_PM_OPS(name, suspend_fn, resume_fn, idle_fn) \
|
||||||
const struct dev_pm_ops __maybe_unused name = { \
|
const struct dev_pm_ops __maybe_unused name = { \
|
||||||
SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
|
||||||
|
Reference in New Issue
Block a user