diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-26 12:12:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-06 13:57:46 +0100 |
| commit | 302666d8a55ce7eb5fb0bd9fbd9437d74e0ce77c (patch) | |
| tree | e5ef29c645f2f178a118669d4a337de792463094 /drivers/pci/pci-driver.c | |
| parent | 0eab11c9ae3b3cc5dd76f20b81d0247647a6e96f (diff) | |
| download | linux-0-day-302666d8a55ce7eb5fb0bd9fbd9437d74e0ce77c.tar.gz linux-0-day-302666d8a55ce7eb5fb0bd9fbd9437d74e0ce77c.tar.xz | |
PCI / PM: Drop unnecessary invocations of pcibios_pm_ops callbacks
The only user of non-empty pcibios_pm_ops is s390 and it only uses
"noirq" callbacks, so drop the invocations of the other pcibios_pm_ops
callbacks from the PCI PM code.
That will allow subsequent changes to be somewhat simpler.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 68a32703b30a3..c1aeeb10539e4 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -922,9 +922,6 @@ static int pci_pm_freeze(struct device *dev) return error; } - if (pcibios_pm_ops.freeze) - return pcibios_pm_ops.freeze(dev); - return 0; } @@ -986,12 +983,6 @@ static int pci_pm_thaw(struct device *dev) const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; int error = 0; - if (pcibios_pm_ops.thaw) { - error = pcibios_pm_ops.thaw(dev); - if (error) - return error; - } - if (pci_has_legacy_pm_support(pci_dev)) return pci_legacy_resume(dev); @@ -1036,9 +1027,6 @@ static int pci_pm_poweroff(struct device *dev) Fixup: pci_fixup_device(pci_fixup_suspend, pci_dev); - if (pcibios_pm_ops.poweroff) - return pcibios_pm_ops.poweroff(dev); - return 0; } @@ -1111,12 +1099,6 @@ static int pci_pm_restore(struct device *dev) const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; int error = 0; - if (pcibios_pm_ops.restore) { - error = pcibios_pm_ops.restore(dev); - if (error) - return error; - } - /* * This is necessary for the hibernation error path in which restore is * called without restoring the standard config registers of the device. |