Skip to content

Commit

Permalink
PM / sleep: Drop pm_request_idle() from pm_generic_complete()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Oct 14, 2015
1 parent a5e22db commit c2df86e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
6 changes: 0 additions & 6 deletions drivers/base/power/generic_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
9 changes: 2 additions & 7 deletions drivers/pci/pci-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit c2df86e

Please sign in to comment.