aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-24 19:33:13 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-27 20:22:36 -0400
commit1cb31d3fd4d96b19624328da0a0496adf76f98a6 (patch)
treeae187eb6b479ef7679ff04e561999f9103e1eaaf
parente19b205be43d11bff638cad4487008c48d21c103 (diff)
PCI / PM: Do not resume any devices in pci_pm_prepare()
It should not be necessary to resume devices with ignore_children set in pci_pm_prepare(), because they should be resumed explicitly by their children drivers during suspend if need be and they will be resumed by pci_pm_suspend() after that anyway, so avoid doing that. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/pci/pci-driver.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 11bd267fc137..3d04b59ffdb2 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -680,13 +680,6 @@ static int pci_pm_prepare(struct device *dev)
680{ 680{
681 struct device_driver *drv = dev->driver; 681 struct device_driver *drv = dev->driver;
682 682
683 /*
684 * Devices having power.ignore_children set may still be necessary for
685 * suspending their children in the next phase of device suspend.
686 */
687 if (dev->power.ignore_children)
688 pm_runtime_resume(dev);
689
690 if (drv && drv->pm && drv->pm->prepare) { 683 if (drv && drv->pm && drv->pm->prepare) {
691 int error = drv->pm->prepare(dev); 684 int error = drv->pm->prepare(dev);
692 if (error) 685 if (error)