PM: sleep: Drop dev_pm_skip_next_resume_phases()
Subsystems (4)
PATCH 1/1 PM: sleep: Drop dev_pm_skip_next_resume_phases()
From: Rafael J. Wysocki <[email protected]>
After recent hibernation-related changes, there are no more callers of dev_pm_skip_next_resume_phases() except for the PM core itself in which it is more straightforward to run the statements from that function directly, so do that and drop it.
---
On top of the patch series at:
https://lore.kernel.org/linux-acpi/[email protected]/T/#madf00de2d5a9b67e3c7bf51e882bd66ed7efc7ea
--- drivers/base/power/main.c | 19 +++---------------- include/linux/pm.h | 1 - 2 files changed, 3 insertions(+), 17 deletions(-)
drivers/base/power/main.c +3 -16
@@ -530,21 +530,6 @@ static void dpm_watchdog_clear(struct dp/*------------------------- Resume routines -------------------------*/ /** -* dev_pm_skip_next_resume_phases - Skip next system resume phases for device. -* @dev: Target device. -* -* Make the core skip the "early resume" and "resume" phases for @dev. -* -* This function can be called by middle-layer code during the "noirq" phase of -* system resume if necessary, but not by device drivers. -*/ -void dev_pm_skip_next_resume_phases (struct device *dev) -{ - dev->power.is_late_suspended = false; - dev->power.is_suspended = false; -} - -/** * suspend_event - Return a "suspend" message for given "resume" one. * @resume_msg: PM message representing a system-wide resume transition. */
@@ -681,6 +666,9 @@ Skip: dev->power.is_noirq_suspended = false;if (skip_resume) { +/* Make the next phases of resume skip the device. */ + dev->power.is_late_suspended = false; + dev->power.is_suspended = false;/* * The device is going to be left in suspend, but it might not * have been in runtime suspend before the system suspended, so
@@ -689,7 +677,6 @@ Skip:* device again. */ pm_runtime_set_suspended (dev); -dev_pm_skip_next_resume_phases (dev); } Out:
include/linux/pm.h +0 -1
@@ -760,7 +760,6 @@ extern int pm_generic_poweroff_late(struextern int pm_generic_poweroff (struct device *dev);extern void pm_generic_complete (struct device *dev); -extern void dev_pm_skip_next_resume_phases (struct device *dev);extern bool dev_pm_may_skip_resume (struct device *dev);extern bool dev_pm_smart_suspend_and_suspended (struct device *dev);
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
After recent hibernation-related changes, there are no more callers of
dev_pm_skip_next_resume_phases()except for the PM core itself in which it is more straightforward to run the statements from that function directly, so do that and drop it.Signed-off-by Rafael J. Wysocki <[email protected]>
Quoted 12 lines · CEST Mika Westerberg
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
After recent hibernation-related changes, there are no more callers of
dev_pm_skip_next_resume_phases()except for the PM core itself in which it is more straightforward to run the statements from that function directly, so do that and drop it.Signed-off-by Rafael J. Wysocki <[email protected]>Reviewed-by Mika Westerberg <[email protected]>
Thanks!
Patch queued for 5.3.