diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-03 06:52:22 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-08 18:46:11 -0400 |
commit | c5d79ec2a5715489cff16a0d1cf4fa9108a5509e (patch) | |
tree | 727950312e41c618195a372857b259f0cb4f8c89 /drivers/base | |
parent | cec89297da88ae9e8df0e3b7ea2e7e464b038cc9 (diff) |
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: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/domain.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index e777609ccc77..4298a2bcd228 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
@@ -615,8 +615,6 @@ static int pm_genpd_runtime_suspend(struct device *dev) | |||
615 | if (IS_ERR(genpd)) | 615 | if (IS_ERR(genpd)) |
616 | return -EINVAL; | 616 | return -EINVAL; |
617 | 617 | ||
618 | might_sleep_if(!genpd->dev_irq_safe); | ||
619 | |||
620 | stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL; | 618 | stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL; |
621 | if (stop_ok && !stop_ok(dev)) | 619 | if (stop_ok && !stop_ok(dev)) |
622 | return -EBUSY; | 620 | return -EBUSY; |
@@ -661,8 +659,6 @@ static int pm_genpd_runtime_resume(struct device *dev) | |||
661 | if (IS_ERR(genpd)) | 659 | if (IS_ERR(genpd)) |
662 | return -EINVAL; | 660 | return -EINVAL; |
663 | 661 | ||
664 | might_sleep_if(!genpd->dev_irq_safe); | ||
665 | |||
666 | /* If power.irq_safe, the PM domain is never powered off. */ | 662 | /* If power.irq_safe, the PM domain is never powered off. */ |
667 | if (dev->power.irq_safe) | 663 | if (dev->power.irq_safe) |
668 | return genpd_start_dev_no_timing(genpd, dev); | 664 | return genpd_start_dev_no_timing(genpd, dev); |