From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 9 Dec 2017 23:56:50 +0000 (+0100)
Subject: PM / core: Use dev_pm_skip_next_resume_phases() internally
X-Git-Tag: for-linus-20180204~17^2~2^2~21^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=34fb8f0ba9ceea88e116688f9f53e3802c38aafb;p=linux-block.git

PM / core: Use dev_pm_skip_next_resume_phases() internally

Make the PM core call dev_pm_skip_next_resume_phases() to skip the
"early resume" and "resume" phases of system-wide transitions to the
working state for a given device instead of clearing the relevant
status bits for it directly.

No intentional changes in functionality.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index d8aa88baf9c1..cd48b1c69167 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -593,8 +593,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn
 		 * device again.
 		 */
 		pm_runtime_set_suspended(dev);
-		dev->power.is_late_suspended = false;
-		dev->power.is_suspended = false;
+		dev_pm_skip_next_resume_phases(dev);
 	}
 
  Out: