PM: domains: Skip another warning in irq_safe_dev_in_sleep_domain()

In irq_safe_dev_in_sleep_domain() we correctly skip the dev_warn_once() if
the corresponding genpd for the device, has the GENPD_FLAG_ALWAYS_ON flag
being set. For the same reason (the genpd is always-on in runtime), let's
also skip the warning if the GENPD_FLAG_RPM_ALWAYS_ON flag is set for the
genpd.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.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
index 269bfa3d2303504d4406318d29a7388ca35b2a6d..a3e727c9a4fa708287fc59cd709c3bd2d2957ad1 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -143,7 +143,10 @@ static inline bool irq_safe_dev_in_sleep_domain(struct device *dev,
         * callbacks are allowed to sleep. This indicates a suboptimal
         * configuration for PM, but it doesn't matter for an always on domain.
         */
-       if (ret && !genpd_is_always_on(genpd))
+       if (genpd_is_always_on(genpd) || genpd_is_rpm_always_on(genpd))
+               return ret;
+
+       if (ret)
                dev_warn_once(dev, "PM domain %s will not be powered off\n",
                                genpd->name);