lkml.org 
[lkml]   [2017]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 4/6] PCI / PM: Drop unnecessary invocations of pcibios_pm_ops callbacks
Date
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>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
---

-> v2: No changes.

---
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
@@ -922,9 +922,6 @@ static int pci_pm_freeze(struct device *
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 *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);

@@ -1036,9 +1027,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;
}

@@ -1111,12 +1099,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.

\
 
 \ /
  Last update: 2017-10-28 20:20    [W:0.403 / U:2.256 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site