Commit 5616ce7b authored by Shawn Guo's avatar Shawn Guo Committed by Rafael J. Wysocki
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 30a0b95b

drivers/base/power/domain.c

+0 −13
Original line number Diff line number Diff line
@@ -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);