summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2016-04-26 08:47:18 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-26 22:28:39 +0200
commit164a2159a2d6789bc7e3c4b126dde7f3ce865992 (patch)
tree1b3c668aa11f42d3a89037dcff838dfb49f97d5b /drivers/base
parent624c8df7d2823ec0df9609025480309322886ed3 (diff)
downloadop-kernel-dev-164a2159a2d6789bc7e3c4b126dde7f3ce865992.zip
op-kernel-dev-164a2159a2d6789bc7e3c4b126dde7f3ce865992.tar.gz
PM / Domains: Drop unnecessary wakeup code from pm_genpd_prepare()
As the PM core already have wakeup management during the system PM phase, it seems reasonable that genpd and its users should be able to rely on that. Therefore let's remove this from pm_genpd_prepare(). Signed-off-by: Ulf Hansson <ulf.hansson@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.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 60a3573..de23b64 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -730,12 +730,6 @@ static int pm_genpd_prepare(struct device *dev)
* at this point and a system wakeup event should be reported if it's
* set up to wake up the system from sleep states.
*/
- if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
- pm_wakeup_event(dev, 0);
-
- if (pm_wakeup_pending())
- return -EBUSY;
-
if (resume_needed(dev, genpd))
pm_runtime_resume(dev);
OpenPOWER on IntegriCloud