]> git.itanic.dy.fi Git - linux-stable/commitdiff
PCI: xgene: Do PCI error check on own line & keep return value
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 11 Sep 2023 12:53:53 +0000 (15:53 +0300)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Oct 2023 21:40:18 +0000 (16:40 -0500)
Instead of an "if" condition with a line split, use the usual error
handling pattern with a separate variable to improve readability.

pci_generic_config_read32() already returns either PCIBIOS_SUCCESSFUL or
PCIBIOS_DEVICE_NOT_FOUND so it is enough to simply return its return value
when ret != PCIBIOS_SUCCESSFUL.

No functional changes intended.

Link: https://lore.kernel.org/r/20230911125354.25501-6-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/controller/pci-xgene.c

index 887b4941ff32f58f83d1da11e8217345ec0cb5e9..8e457fa450a2c4044a79449a3bc96794752e9443 100644 (file)
@@ -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