PM / sleep: Drop pm_request_idle() from pm_generic_complete()

The pm_request_idle() in pm_generic_complete() is pointless as it is
called with the runtime PM usage counter different from zero (bumped
up by the core during the prepare phase of system suspend) and the
core calls pm_runtime_put() for all devices after executing their
complete callbacks, so drop it.

This allows the PCI PM layer to use pm_generic_complete() too.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index 96a92db83cad863ac286ce2249b573bb7c1085a6..b2ed606265a8115a689ecf84979dc16f4dda645c 100644 (file)
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -296,11 +296,5 @@ void pm_generic_complete(struct device *dev)
 
        if (drv && drv->pm && drv->pm->complete)
                drv->pm->complete(dev);
-
-       /*
-        * Let runtime PM try to suspend devices that haven't been in use before
-        * going into the system-wide sleep state we're resuming from.
-        */
-       pm_request_idle(dev);
 }
 #endif /* CONFIG_PM_SLEEP */

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 8dfb144b8ccf5a0ef0b265540199ac28d85cb281..c9ce3073d7fe981686211dbfb1e56850d050614e 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -686,13 +686,8 @@ static int pci_pm_prepare(struct device *dev)
 
 static void pci_pm_complete(struct device *dev)
 {
-       struct device_driver *drv = dev->driver;
-       struct pci_dev *pci_dev = to_pci_dev(dev);
-
-       pci_dev_complete_resume(pci_dev);
-
-       if (drv && drv->pm && drv->pm->complete)
-               drv->pm->complete(dev);
+       pci_dev_complete_resume(to_pci_dev(dev));
+       pm_generic_complete(dev);
 }
 
 #else /* !CONFIG_PM_SLEEP */