PCI: Cleanup control flow

Return errors immediately so the straightline path is the normal,
no-error path.  No functional change.

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

6 files changed, 62 insertions, 70 deletions

diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index 8a275f297522..91fe97144570 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/pcie.c
@@ -155,17 +155,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 static struct pci_bus __init *
 dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 {
-        struct pci_bus *bus;
-
-        if (nr < num_pcie_ports) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                        &sys->resources);
-        } else {
-                bus = NULL;
+        if (nr >= num_pcie_ports) {
                 BUG();
+                return NULL;
         }
 
-        return bus;
+        return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                 &sys->resources);
 }
 
 static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index 445e553f4a28..097ea4cb1136 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -197,17 +197,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 static struct pci_bus __init *
 mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 {
-        struct pci_bus *bus;
-
-        if (nr < num_pcie_ports) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                        &sys->resources);
-        } else {
-                bus = NULL;
+        if (nr >= num_pcie_ports) {
                 BUG();
+                return NULL;
         }
 
-        return bus;
+        return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                 &sys->resources);
 }
 
 static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot,
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index 87a12d6930ff..b02f3947be51 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -540,37 +540,33 @@ void __init orion5x_pci_set_cardbus_mode(void)
 
 int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)
 {
-        int ret = 0;
-
         vga_base = ORION5X_PCIE_MEM_PHYS_BASE;
 
         if (nr == 0) {
                 orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr);
-                ret = pcie_setup(sys);
-        } else if (nr == 1 && !orion5x_pci_disabled) {
+                return pcie_setup(sys);
+        }
+
+        if (nr == 1 && !orion5x_pci_disabled) {
                 orion5x_pci_set_bus_nr(sys->busnr);
-                ret = pci_setup(sys);
+                return pci_setup(sys);
         }
 
-        return ret;
+        return 0;
 }
 
 struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys)
 {
-        struct pci_bus *bus;
+        if (nr == 0)
+                return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                         &sys->resources);
 
-        if (nr == 0) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
-                                        &sys->resources);
-        } else if (nr == 1 && !orion5x_pci_disabled) {
-                bus = pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys,
-                                        &sys->resources);
-        } else {
-                bus = NULL;
-                BUG();
-        }
+        if (nr == 1 && !orion5x_pci_disabled)
+                return pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys,
+                                         &sys->resources);
 
-        return bus;
+        BUG();
+        return NULL;
 }
 
 int __init orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 9eb54b557c9f..8bb13a4af68a 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -94,28 +94,29 @@ static void pcibios_scanbus(struct pci_controller *hose)
         pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset);
         bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
                                 &resources);
-        if (!bus)
-                pci_free_resource_list(&resources);
-
         hose->bus = bus;
 
         need_domain_info = need_domain_info || hose->index;
         hose->need_domain_info = need_domain_info;
-        if (bus) {
-                next_busno = bus->busn_res.end + 1;
-                /* Don't allow 8-bit bus number overflow inside the hose -
-                   reserve some space for bridges. */
-                if (next_busno > 224) {
-                        next_busno = 0;
-                        need_domain_info = 1;
-                }
 
-                if (!pci_has_flag(PCI_PROBE_ONLY)) {
-                        pci_bus_size_bridges(bus);
-                        pci_bus_assign_resources(bus);
-                }
-                pci_bus_add_devices(bus);
+        if (!bus) {
+                pci_free_resource_list(&resources);
+                return;
+        }
+
+        next_busno = bus->busn_res.end + 1;
+        /* Don't allow 8-bit bus number overflow inside the hose -
+           reserve some space for bridges. */
+        if (next_busno > 224) {
+                next_busno = 0;
+                need_domain_info = 1;
+        }
+
+        if (!pci_has_flag(PCI_PROBE_ONLY)) {
+                pci_bus_size_bridges(bus);
+                pci_bus_assign_resources(bus);
         }
+        pci_bus_add_devices(bus);
 }
 
 #ifdef CONFIG_OF
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index efc10519916a..d5462b7bc514 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -58,21 +58,23 @@ static void pcibios_scanbus(struct pci_channel *hose)
 
         need_domain_info = need_domain_info || hose->index;
         hose->need_domain_info = need_domain_info;
-        if (bus) {
-                next_busno = bus->busn_res.end + 1;
-                /* Don't allow 8-bit bus number overflow inside the hose -
-                   reserve some space for bridges. */
-                if (next_busno > 224) {
-                        next_busno = 0;
-                        need_domain_info = 1;
-                }
 
-                pci_bus_size_bridges(bus);
-                pci_bus_assign_resources(bus);
-                pci_bus_add_devices(bus);
-        } else {
+        if (!bus) {
                 pci_free_resource_list(&resources);
+                return;
+        }
+
+        next_busno = bus->busn_res.end + 1;
+        /* Don't allow 8-bit bus number overflow inside the hose -
+           reserve some space for bridges. */
+        if (next_busno > 224) {
+                next_busno = 0;
+                need_domain_info = 1;
         }
+
+        pci_bus_size_bridges(bus);
+        pci_bus_assign_resources(bus);
+        pci_bus_add_devices(bus);
 }
 
 /*
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index 297107679fdf..4371f72ff025 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -34,16 +34,17 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
 
         root_bus = pci_scan_root_bus(&ofdev->dev, 0, info->ops, info,
                                      &resources);
-        if (root_bus) {
-                /* Setup IRQs of all devices using custom routines */
-                pci_fixup_irqs(pci_common_swizzle, info->map_irq);
-
-                /* Assign devices with resources */
-                pci_assign_unassigned_resources();
-                pci_bus_add_devices(root_bus);
-        } else {
+        if (!root_bus) {
                 pci_free_resource_list(&resources);
+                return;
         }
+
+        /* Setup IRQs of all devices using custom routines */
+        pci_fixup_irqs(pci_common_swizzle, info->map_irq);
+
+        /* Assign devices with resources */
+        pci_assign_unassigned_resources();
+        pci_bus_add_devices(root_bus);
 }
 
 void pcibios_fixup_bus(struct pci_bus *pbus)