| Message ID | 2094189.3ZuY7TBjup@aspire.rjw.lan (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 16 October 2017 at 03:29, Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/pci/pci-driver.c | 18 ------------------ > 1 file changed, 18 deletions(-) > > Index: linux-pm/drivers/pci/pci-driver.c > =================================================================== > --- linux-pm.orig/drivers/pci/pci-driver.c > +++ linux-pm/drivers/pci/pci-driver.c > @@ -918,9 +918,6 @@ static int pci_pm_freeze(struct device * > return error; > } > > - if (pcibios_pm_ops.freeze) > - return pcibios_pm_ops.freeze(dev); > - > return 0; > } > > @@ -982,12 +979,6 @@ static int pci_pm_thaw(struct device *de > 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); > > @@ -1032,9 +1023,6 @@ static int pci_pm_poweroff(struct device > Fixup: > pci_fixup_device(pci_fixup_suspend, pci_dev); > > - if (pcibios_pm_ops.poweroff) > - return pcibios_pm_ops.poweroff(dev); > - > return 0; > } > > @@ -1107,12 +1095,6 @@ static int pci_pm_restore(struct device > 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. > >
Index: linux-pm/drivers/pci/pci-driver.c =================================================================== --- linux-pm.orig/drivers/pci/pci-driver.c +++ linux-pm/drivers/pci/pci-driver.c @@ -918,9 +918,6 @@ static int pci_pm_freeze(struct device * return error; } - if (pcibios_pm_ops.freeze) - return pcibios_pm_ops.freeze(dev); - return 0; } @@ -982,12 +979,6 @@ static int pci_pm_thaw(struct device *de 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); @@ -1032,9 +1023,6 @@ static int pci_pm_poweroff(struct device Fixup: pci_fixup_device(pci_fixup_suspend, pci_dev); - if (pcibios_pm_ops.poweroff) - return pcibios_pm_ops.poweroff(dev); - return 0; } @@ -1107,12 +1095,6 @@ static int pci_pm_restore(struct device 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.