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>

1 files changed, 9 insertions, 8 deletions

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)