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

diff --cc drivers/base/power/domain.c
index 764e0f28979e02f20c87ee4a7f442a5ddd1b2e23,f01257607bf7e3b19476ebe99339d63e4537a375..76c9969b7124c11cf1638a82cc223999ae5e1b8a
--- 1/drivers/base/power/domain.c
--- 2/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);