Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

PM / domains: Remove dev_irq_safe from genpd config 



The genpd dev_irq_safe configuration somewhat overlaps with the runtime
PM pm_runtime_irq_safe() option. Also, currently genpd don't have a
good way to deal with these device. So, until we figured out if and how
to support this in genpd, let's remove the option to configure it.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cec89297

drivers/base/power/domain.c

+0 −4
Original line number Diff line number Diff line
@@ -615,8 +615,6 @@ static int pm_genpd_runtime_suspend(struct device *dev) 
	if (IS_ERR(genpd))

		return -EINVAL;



	might_sleep_if(!genpd->dev_irq_safe);



	stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL;

	if (stop_ok && !stop_ok(dev))

		return -EBUSY;
@@ -661,8 +659,6 @@ static int pm_genpd_runtime_resume(struct device *dev) 
	if (IS_ERR(genpd))

		return -EINVAL;



	might_sleep_if(!genpd->dev_irq_safe);



	/* If power.irq_safe, the PM domain is never powered off. */

	if (dev->power.irq_safe)

		return genpd_start_dev_no_timing(genpd, dev);

include/linux/pm_domain.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ struct generic_pm_domain { 
	unsigned int suspended_count;	/* System suspend device counter */

	unsigned int prepared_count;	/* Suspend counter of prepared devices */

	bool suspend_power_off;	/* Power status before system suspend */

	bool dev_irq_safe;	/* Device callbacks are IRQ-safe */

	int (*power_off)(struct generic_pm_domain *domain);

	s64 power_off_latency_ns;

	int (*power_on)(struct generic_pm_domain *domain);