From: Rafael J. Wysocki Date: Sun, 24 Sep 2017 23:33:13 +0000 (+0200) Subject: PCI / PM: Do not resume any devices in pci_pm_prepare() X-Git-Tag: v4.15-rc1~145^2~9^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cb31d3fd4d96b19624328da0a0496adf76f98a6;p=thirdparty%2Flinux.git 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 Acked-by: Bjorn Helgaas Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 11bd267fc1371..3d04b59ffdb2a 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) { 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)