From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 14 Mar 2019 09:53:08 +0000 (+0100)
Subject: Merge branch 'pm-domains'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=75f3e2395430ad6416a7d35e892db7ff60e012e1;p=linux.git

Merge branch 'pm-domains'

* pm-domains:
  PM / domains: Remove one unnecessary blank line
  PM / Domains: Return early for all errors in _genpd_power_off()
  PM / Domains: Improve warn for multiple states but no governor
---

75f3e2395430ad6416a7d35e892db7ff60e012e1
diff --cc drivers/base/power/domain.c
index 764e0f28979e0,f01257607bf7e..76c9969b7124c
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@@ -1768,8 -1766,8 +1768,8 @@@ int pm_genpd_init(struct generic_pm_dom
  		ret = genpd_set_default_power_state(genpd);
  		if (ret)
  			return ret;
- 	} else if (!gov) {
+ 	} else if (!gov && genpd->state_count > 1) {
 -		pr_warn("%s : no governor for states\n", genpd->name);
 +		pr_warn("%s: no governor for states\n", genpd->name);
  	}
  
  	device_initialize(&genpd->dev);