]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
PCI/PM: Remove pci_pm_complete()
authorLiu Chuansheng <chuansheng.liu@intel.com>
Mon, 7 Oct 2013 21:29:27 +0000 (15:29 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 7 Oct 2013 21:29:27 +0000 (15:29 -0600)
88d26136 ("PM: Prevent runtime suspend during system resume") removed the
pm_runtime_put_sync() from pci_pm_complete() to PM core code
device_complete().

Here the pci_pm_complete() is doing the same work which can be done in
device_complete(), so we can remove it directly.

Signed-off-by: Liu Chuansheng <chuansheng.liu@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/pci/pci-driver.c

index 32b6bc5a23ac7f91d18ecbb05e50bc9bdd3b42ae..b60fe6737f78d0e84da6663626fad72b9e32bcb5 100644 (file)
@@ -599,18 +599,10 @@ static int pci_pm_prepare(struct device *dev)
        return error;
 }
 
-static void pci_pm_complete(struct device *dev)
-{
-       struct device_driver *drv = dev->driver;
-
-       if (drv && drv->pm && drv->pm->complete)
-               drv->pm->complete(dev);
-}
 
 #else /* !CONFIG_PM_SLEEP */
 
 #define pci_pm_prepare NULL
-#define pci_pm_complete        NULL
 
 #endif /* !CONFIG_PM_SLEEP */
 
@@ -1123,7 +1115,6 @@ static int pci_pm_runtime_idle(struct device *dev)
 
 static const struct dev_pm_ops pci_dev_pm_ops = {
        .prepare = pci_pm_prepare,
-       .complete = pci_pm_complete,
        .suspend = pci_pm_suspend,
        .resume = pci_pm_resume,
        .freeze = pci_pm_freeze,