Skip to content

Commit

Permalink
PCI / PM: Drop unnecessary invocations of pcibios_pm_ops callbacks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Nov 6, 2017
1 parent 0eab11c commit 302666d
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions drivers/pci/pci-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 302666d

Please sign in to comment.