diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-02-16 15:22:39 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-02-21 17:24:04 -0600 |
| commit | 204f4afa7ae50239c39adb13af42f5720fe7e9a5 (patch) | |
| tree | 1c2592f302c372e425d2a8f63e04cce93351be24 /drivers/pci/pci.c | |
| parent | 5b0764cac9f1b70a6704b0e546be67c24cc05517 (diff) | |
| download | linux-stable-204f4afa7ae50239c39adb13af42f5720fe7e9a5.tar.gz linux-stable-204f4afa7ae50239c39adb13af42f5720fe7e9a5.tar.bz2 linux-stable-204f4afa7ae50239c39adb13af42f5720fe7e9a5.zip | |
PCI: Remove redundant probes for device reset support
We probe every device for whether it supports reset so we can tell whether
to create a sysfs "reset" file for it. We do that probe in
pci_init_capabilities() during enumeration and save the result in
dev->reset_fn. The result doesn't depend on any other devices on the bus
and shouldn't change after boot, so we don't need to do the probe again.
Remove the pci_probe_reset_function() calls and rely on the dev->reset_fn
we found during enumeration. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index f6a4dd10d9b0..4db740e4f50a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4450,9 +4450,8 @@ int pci_reset_function(struct pci_dev *dev) { int rc; - rc = pci_probe_reset_function(dev); - if (rc) - return rc; + if (!dev->reset_fn) + return -ENOTTY; pci_dev_lock(dev); pci_dev_save_and_disable(dev); @@ -4487,9 +4486,8 @@ int pci_reset_function_locked(struct pci_dev *dev) { int rc; - rc = pci_probe_reset_function(dev); - if (rc) - return rc; + if (!dev->reset_fn) + return -ENOTTY; pci_dev_save_and_disable(dev); @@ -4511,9 +4509,8 @@ int pci_try_reset_function(struct pci_dev *dev) { int rc; - rc = pci_probe_reset_function(dev); - if (rc) - return rc; + if (!dev->reset_fn) + return -ENOTTY; if (!pci_dev_trylock(dev)) return -EAGAIN; |