Revert "PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device"

rafaeljw · rafaeljw · commit 23c6d2c73f4c · 2017-07-04T21:55:13.000+02:00
Revert commit 8b55e55 (PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device) which was misguided (the change made by it was not necessary) and it introduced a call to a function that may sleep into an atomic context code path. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
@@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend)
 {
 	struct generic_pm_domain *genpd;
 
-	genpd = genpd_lookup_dev(dev);
-	if (!genpd)
+	genpd = dev_to_genpd(dev);
+	if (!pm_genpd_present(genpd))
 		return;
 
 	if (suspend) {

Original file line number	Diff line number	Diff line change
`@@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend)`
`1148`	`1148`	`{`
`1149`	`1149`	`struct generic_pm_domain *genpd;`
`1150`	`1150`
`1151`		`- genpd = genpd_lookup_dev(dev);`
`1152`		`- if (!genpd)`
	`1151`	`+ genpd = dev_to_genpd(dev);`
	`1152`	`+ if (!pm_genpd_present(genpd))`
`1153`	`1153`	`return;`
`1154`	`1154`
`1155`	`1155`	`if (suspend) {`