diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-10-28 13:31:03 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-10-28 13:31:03 -0500 |
| commit | 65de3fd8f5c8a910e5bebc0607f8790158ad673a (patch) | |
| tree | f63cd8e27e9b17c83058990e3a92ea77d326b57b /drivers/pci/controller | |
| parent | Merge branch 'pci/controller/xilinx-xdma' (diff) | |
| parent | scsi: ipr: Do PCI error checks on own line (diff) | |
| download | linux-65de3fd8f5c8a910e5bebc0607f8790158ad673a.tar.gz linux-65de3fd8f5c8a910e5bebc0607f8790158ad673a.zip | |
Merge branch 'pci/config-errs'
- Simplify config accessor error checking (Ilpo Järvinen)
* pci/config-errs:
scsi: ipr: Do PCI error checks on own line
PCI: xgene: Do PCI error check on own line & keep return value
PCI: Do error check on own line to split long "if" conditions
atm: iphase: Do PCI error checks on own line
sh: pci: Do PCI error check on own line
alpha: Streamline convoluted PCI error handling
Diffstat (limited to 'drivers/pci/controller')
| -rw-r--r-- | drivers/pci/controller/pci-xgene.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c index 887b4941ff32..8e457fa450a2 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -163,10 +163,11 @@ static int xgene_pcie_config_read32(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val) { struct xgene_pcie *port = pcie_bus_to_port(bus); + int ret; - if (pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val) != - PCIBIOS_SUCCESSFUL) - return PCIBIOS_DEVICE_NOT_FOUND; + ret = pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val); + if (ret != PCIBIOS_SUCCESSFUL) + return ret; /* * The v1 controller has a bug in its Configuration Request Retry |