summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorGabriel Krisman Bertazi <krisman@collabora.co.uk>2017-02-06 13:34:14 -0200
committerBjorn Helgaas <bhelgaas@google.com>2017-02-10 15:09:20 -0600
commitfed678145d02d08d75825d9f0854fad93cffd1a0 (patch)
treef6eff3da1c7d2835abcaaaa165982005475891b3 /drivers/pci
parent60db3a4d8cc9073cf56264785197ba75ee1caca4 (diff)
downloadlinux-fed678145d02d08d75825d9f0854fad93cffd1a0.tar.gz
linux-fed678145d02d08d75825d9f0854fad93cffd1a0.tar.bz2
linux-fed678145d02d08d75825d9f0854fad93cffd1a0.zip
PCI: Remove duplicate check for positive return value from probe() functions
Function __pci_device_probe() tries to be careful about a PCI driver probe() hook returning a positive value, but this is not really necessary, since the same fix up is already done in local_pci_probe() (preceded by a noisy warning), which renders this instance dead code. Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-driver.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 1ccce1cd6aca..3e0516ee9eab 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -381,8 +381,6 @@ static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
id = pci_match_device(drv, pci_dev);
if (id)
error = pci_call_probe(drv, pci_dev, id);
- if (error >= 0)
- error = 0;
}
return error;
}