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 --combined drivers/base/power/domain.c
index 764e0f2,f012576..76c9969
--- 1/drivers/base/power/domain.c
--- 2/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@@ -6,8 -6,6 +6,8 @@@
   * This file is released under the GPLv2.
   */
  
 +#define pr_fmt(fmt) "PM: " fmt
 +
  #include <linux/delay.h>
  #include <linux/kernel.h>
  #include <linux/io.h>
@@@ -459,19 -457,19 +459,19 @@@ static int _genpd_power_off(struct gene
  
        time_start = ktime_get();
        ret = genpd->power_off(genpd);
-       if (ret == -EBUSY)
+       if (ret)
                return ret;
  
        elapsed_ns = ktime_to_ns(ktime_sub(ktime_get(), time_start));
        if (elapsed_ns <= genpd->states[state_idx].power_off_latency_ns)
-               return ret;
+               return 0;
  
        genpd->states[state_idx].power_off_latency_ns = elapsed_ns;
        genpd->max_off_time_changed = true;
        pr_debug("%s: Power-%s latency exceeded, new value %lld ns\n",
                 genpd->name, "off", elapsed_ns);
  
-       return ret;
+       return 0;
  }
  
  /**
@@@ -1659,8 -1657,8 +1659,8 @@@ int pm_genpd_remove_subdomain(struct ge
        genpd_lock_nested(genpd, SINGLE_DEPTH_NESTING);
  
        if (!list_empty(&subdomain->master_links) || subdomain->device_count) {
 -              pr_warn("%s: unable to remove subdomain %s\n", genpd->name,
 -                      subdomain->name);
 +              pr_warn("%s: unable to remove subdomain %s\n",
 +                      genpd->name, subdomain->name);
                ret = -EBUSY;
                goto out;
        }
@@@ -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);
@@@ -2516,7 -2514,7 +2516,7 @@@ static int genpd_parse_state(struct gen
                                                &entry_latency);
        if (err) {
                pr_debug(" * %pOF missing entry-latency-us property\n",
 -                                              state_node);
 +                       state_node);
                return -EINVAL;
        }
  
@@@ -2524,7 -2522,7 +2524,7 @@@
                                                &exit_latency);
        if (err) {
                pr_debug(" * %pOF missing exit-latency-us property\n",
 -                                              state_node);
 +                       state_node);
                return -EINVAL;
        }