Commit 7a02444b authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM: domains: Rename irq_safe_dev_in_no_sleep_domain() in genpd 



The name "irq_safe_dev_in_no_sleep_domain", doesn't really match the
conditions that are being checked in the function, hence the code becomes a
bit confusing to read.

Let's clarify this by renaming it into "irq_safe_dev_in_sleep_domain" and
let's also take the opportunity to clarify a corresponding comment in the
code.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3f9ee7da

drivers/base/power/domain.c

+7 −7
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static const struct genpd_lock_ops genpd_spin_ops = { 
#define genpd_is_cpu_domain(genpd)	(genpd->flags & GENPD_FLAG_CPU_DOMAIN)

#define genpd_is_rpm_always_on(genpd)	(genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON)



static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev,

static inline bool irq_safe_dev_in_sleep_domain(struct device *dev,

		const struct generic_pm_domain *genpd)

{

	bool ret;
@@ -139,9 +139,9 @@ static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev, 
	ret = pm_runtime_is_irq_safe(dev) && !genpd_is_irq_safe(genpd);



	/*

	 * Warn once if an IRQ safe device is attached to a no sleep domain, as

	 * to indicate a suboptimal configuration for PM. For an always on

	 * domain this isn't case, thus don't warn.

	 * Warn once if an IRQ safe device is attached to a domain, which

	 * 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))

		dev_warn_once(dev, "PM domain %s will not be powered off\n",
@@ -653,7 +653,7 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on, 
		 * device is part of a non-IRQ safe domain.

		 */

		if (!pm_runtime_suspended(pdd->dev) ||

			irq_safe_dev_in_no_sleep_domain(pdd->dev, genpd))

			irq_safe_dev_in_sleep_domain(pdd->dev, genpd))

			not_suspended++;

	}
@@ -925,7 +925,7 @@ static int genpd_runtime_suspend(struct device *dev) 
	 * If power.irq_safe is set, this routine may be run with

	 * IRQs disabled, so suspend only if the PM domain also is irq_safe.

	 */

	if (irq_safe_dev_in_no_sleep_domain(dev, genpd))

	if (irq_safe_dev_in_sleep_domain(dev, genpd))

		return 0;



	genpd_lock(genpd);
@@ -965,7 +965,7 @@ static int genpd_runtime_resume(struct device *dev) 
	 * As we don't power off a non IRQ safe domain, which holds

	 * an IRQ safe device, we don't need to restore power to it.

	 */

	if (irq_safe_dev_in_no_sleep_domain(dev, genpd)) {

	if (irq_safe_dev_in_sleep_domain(dev, genpd)) {

		timed = false;

		goto out;

	}