* [PATCH] PM: sleep: Drop dev_pm_skip_next_resume_phases()
@ 2019-07-03 23:05 Rafael J. Wysocki
2019-07-04 8:01 ` Mika Westerberg
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2019-07-03 23:05 UTC (permalink / raw)
To: Linux PM; +Cc: LKML, Mika Westerberg
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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 <rafael.j.wysocki@intel.com>
---
On top of the patch series at:
https://lore.kernel.org/linux-acpi/20190701162017.GB2640@lahna.fi.intel.com/T/#madf00de2d5a9b67e3c7bf51e882bd66ed7efc7ea
---
drivers/base/power/main.c | 19 +++----------------
include/linux/pm.h | 1 -
2 files changed, 3 insertions(+), 17 deletions(-)
Index: linux-pm/drivers/base/power/main.c
===================================================================
--- linux-pm.orig/drivers/base/power/main.c
+++ linux-pm/drivers/base/power/main.c
@@ -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:
Index: linux-pm/include/linux/pm.h
===================================================================
--- linux-pm.orig/include/linux/pm.h
+++ linux-pm/include/linux/pm.h
@@ -760,7 +760,6 @@ extern int pm_generic_poweroff_late(stru
extern 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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PM: sleep: Drop dev_pm_skip_next_resume_phases()
2019-07-03 23:05 [PATCH] PM: sleep: Drop dev_pm_skip_next_resume_phases() Rafael J. Wysocki
@ 2019-07-04 8:01 ` Mika Westerberg
2019-07-05 10:09 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Mika Westerberg @ 2019-07-04 8:01 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM, LKML
On Thu, Jul 04, 2019 at 01:05:38AM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> 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 <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PM: sleep: Drop dev_pm_skip_next_resume_phases()
2019-07-04 8:01 ` Mika Westerberg
@ 2019-07-05 10:09 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2019-07-05 10:09 UTC (permalink / raw)
To: Mika Westerberg; +Cc: Linux PM, LKML
On Thursday, July 4, 2019 10:01:20 AM CEST Mika Westerberg wrote:
> On Thu, Jul 04, 2019 at 01:05:38AM +0200, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > 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 <rafael.j.wysocki@intel.com>
>
> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
>
Thanks!
Patch queued for 5.3.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-05 10:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-03 23:05 [PATCH] PM: sleep: Drop dev_pm_skip_next_resume_phases() Rafael J. Wysocki
2019-07-04 8:01 ` Mika Westerberg
2019-07-05 10:09 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).