summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2022-11-02 22:21:01 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-11-03 19:40:58 +0100
commit5616ce7b780af6103d7724f119514a6eb7b05f66 (patch)
tree0f1eb5cbe42b992c632213fed717a206c28b1d85
parent30a0b95b1335e12efef89dd78518ed3e4a71a763 (diff)
PM: domains: Drop genpd status manipulation for hibernate restore
The genpd status manipulation for hibernate restore has really never worked as intended. For example, if the genpd->status was GENPD_STATE_ON, the parent domain's `sd_count` must have been increased, so it needs to be adjusted too. So drop this status manipulation. Suggested-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/base/power/domain.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 6471b559230e..97deae1d4e77 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1374,20 +1374,7 @@ static int genpd_restore_noirq(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- /*
- * At this point suspended_count == 0 means we are being run for the
- * first time for the given domain in the present cycle.
- */
genpd_lock(genpd);
- if (genpd->suspended_count++ == 0) {
- /*
- * The boot kernel might put the domain into arbitrary state,
- * so make it appear as powered off to genpd_sync_power_on(),
- * so that it tries to power it on in case it was really off.
- */
- genpd->status = GENPD_STATE_OFF;
- }
-
genpd_sync_power_on(genpd, true, 0);
genpd_unlock(genpd);