PCI: Simplify config space size computation

Restructure the logic so we return the config space size as soon as we know
it.  This reduces indentation, removes negations, and removes gotos.

No functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index edb1984201e9..0d86c82b8880 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1107,14 +1107,11 @@ static int pci_cfg_space_size_ext(struct pci_dev *dev)
         int pos = PCI_CFG_SPACE_SIZE;
 
         if (pci_read_config_dword(dev, pos, &status) != PCIBIOS_SUCCESSFUL)
-                goto fail;
+                return PCI_CFG_SPACE_SIZE;
         if (status == 0xffffffff || pci_ext_cfg_is_aliased(dev))
-                goto fail;
+                return PCI_CFG_SPACE_SIZE;
 
         return PCI_CFG_SPACE_EXP_SIZE;
-
- fail:
-        return PCI_CFG_SPACE_SIZE;
 }
 
 int pci_cfg_space_size(struct pci_dev *dev)
@@ -1127,19 +1124,17 @@ int pci_cfg_space_size(struct pci_dev *dev)
         if (class == PCI_CLASS_BRIDGE_HOST)
                 return pci_cfg_space_size_ext(dev);
 
-        if (!pci_is_pcie(dev)) {
-                pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
-                if (!pos)
-                        goto fail;
+        if (pci_is_pcie(dev))
+                return pci_cfg_space_size_ext(dev);
 
-                pci_read_config_dword(dev, pos + PCI_X_STATUS, &status);
-                if (!(status & (PCI_X_STATUS_266MHZ | PCI_X_STATUS_533MHZ)))
-                        goto fail;
-        }
+        pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
+        if (!pos)
+                return PCI_CFG_SPACE_SIZE;
 
-        return pci_cfg_space_size_ext(dev);
+        pci_read_config_dword(dev, pos + PCI_X_STATUS, &status);
+        if (status & (PCI_X_STATUS_266MHZ | PCI_X_STATUS_533MHZ))
+                return pci_cfg_space_size_ext(dev);
 
- fail:
         return PCI_CFG_SPACE_SIZE;
 }