PM / Domains: Drop unnecessary wakeup code from pm_genpd_prepare()
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 26 Apr 2016 06:47:18 +0000 (08:47 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 26 Apr 2016 20:28:39 +0000 (22:28 +0200)
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>
drivers/base/power/domain.c

index 60a3573..de23b64 100644 (file)
@@ -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);