diff options
author | Liu Chuansheng <chuansheng.liu@intel.com> | 2013-10-07 17:29:27 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-07 17:29:27 -0400 |
commit | 84822b158fd3fc7d9f9c67f1b26a1e007880e13c (patch) | |
tree | 07226f328cacfe88b114a2fc8e5bf8248ef53e98 /drivers/pci/pci-driver.c | |
parent | c489f5fbb1f5a770f98e492af5c47befb32890cd (diff) |
PCI/PM: Remove pci_pm_complete()
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>
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 32b6bc5a23ac..b60fe6737f78 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -599,18 +599,10 @@ static int pci_pm_prepare(struct device *dev) | |||
599 | return error; | 599 | return error; |
600 | } | 600 | } |
601 | 601 | ||
602 | static void pci_pm_complete(struct device *dev) | ||
603 | { | ||
604 | struct device_driver *drv = dev->driver; | ||
605 | |||
606 | if (drv && drv->pm && drv->pm->complete) | ||
607 | drv->pm->complete(dev); | ||
608 | } | ||
609 | 602 | ||
610 | #else /* !CONFIG_PM_SLEEP */ | 603 | #else /* !CONFIG_PM_SLEEP */ |
611 | 604 | ||
612 | #define pci_pm_prepare NULL | 605 | #define pci_pm_prepare NULL |
613 | #define pci_pm_complete NULL | ||
614 | 606 | ||
615 | #endif /* !CONFIG_PM_SLEEP */ | 607 | #endif /* !CONFIG_PM_SLEEP */ |
616 | 608 | ||
@@ -1123,7 +1115,6 @@ static int pci_pm_runtime_idle(struct device *dev) | |||
1123 | 1115 | ||
1124 | static const struct dev_pm_ops pci_dev_pm_ops = { | 1116 | static const struct dev_pm_ops pci_dev_pm_ops = { |
1125 | .prepare = pci_pm_prepare, | 1117 | .prepare = pci_pm_prepare, |
1126 | .complete = pci_pm_complete, | ||
1127 | .suspend = pci_pm_suspend, | 1118 | .suspend = pci_pm_suspend, |
1128 | .resume = pci_pm_resume, | 1119 | .resume = pci_pm_resume, |
1129 | .freeze = pci_pm_freeze, | 1120 | .freeze = pci_pm_freeze, |