summaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/kernel
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-05-25 21:48:33 +0800
committerBjorn Helgaas <bhelgaas@google.com>2013-06-07 14:27:31 -0600
commita649dbfea36bdcead7ffddc622c272844b95a13e (patch)
treea44c783d4f94aa0eb519d54a7e743091599467af /arch/ia64/sn/kernel
parent8b1fce04dc2a2210f050484afa85acc3a81cfbba (diff)
downloadlinux-stable-a649dbfea36bdcead7ffddc622c272844b95a13e.tar.gz
linux-stable-a649dbfea36bdcead7ffddc622c272844b95a13e.tar.bz2
linux-stable-a649dbfea36bdcead7ffddc622c272844b95a13e.zip
ia64/PCI: Clean up pci_scan_root_bus() usage
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>
Diffstat (limited to 'arch/ia64/sn/kernel')
-rw-r--r--arch/ia64/sn/kernel/io_init.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 238e2c511d94..e2c7733e18a7 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -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);
}
/*