]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
PCI / PM: Do not resume any devices in pci_pm_prepare()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 24 Sep 2017 23:33:13 +0000 (01:33 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Sep 2017 00:22:36 +0000 (02:22 +0200)
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>
drivers/pci/pci-driver.c

index 11bd267fc1371acc303795876a6fba0b7725767a..3d04b59ffdb2ac5dbe815601cc6d49b62a3d1fd0 100644 (file)
@@ -680,13 +680,6 @@ static int pci_pm_prepare(struct device *dev)
 {
        struct device_driver *drv = dev->driver;
 
-       /*
-        * Devices having power.ignore_children set may still be necessary for
-        * suspending their children in the next phase of device suspend.
-        */
-       if (dev->power.ignore_children)
-               pm_runtime_resume(dev);
-
        if (drv && drv->pm && drv->pm->prepare) {
                int error = drv->pm->prepare(dev);
                if (error)