ia64/PCI: Clean up pci_scan_root_bus() usage
authorJiang Liu <liuj97@gmail.com>
Sat, 25 May 2013 13:48:33 +0000 (21:48 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 7 Jun 2013 20:27:31 +0000 (14:27 -0600)
pci_scan_root_bus() already set bus->sysdata, so no need to explicitly
set it again in function sn_pci_controller_fixup().

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
arch/ia64/sn/kernel/io_init.c

index 238e2c511d94e735fb823cb612d30a7333a28510..e2c7733e18a7cc443575011702944152550ef7d6 100644 (file)
@@ -326,16 +326,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
        bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,
                                &resources);
        if (bus == NULL)
-               goto error_return; /* error, or bus already scanned */
-
-       bus->sysdata = controller;
-
-       return;
-
-error_return:
-
-       kfree(controller);
-       return;
+               kfree(controller);
 }
 
 /*