diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-05-25 09:48:33 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-07 16:27:31 -0400 |
commit | a649dbfea36bdcead7ffddc622c272844b95a13e (patch) | |
tree | a44c783d4f94aa0eb519d54a7e743091599467af /arch/ia64 | |
parent | 8b1fce04dc2a2210f050484afa85acc3a81cfbba (diff) |
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')
-rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 11 |
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) | |||
326 | bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, | 326 | bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, |
327 | &resources); | 327 | &resources); |
328 | if (bus == NULL) | 328 | if (bus == NULL) |
329 | goto error_return; /* error, or bus already scanned */ | 329 | kfree(controller); |
330 | |||
331 | bus->sysdata = controller; | ||
332 | |||
333 | return; | ||
334 | |||
335 | error_return: | ||
336 | |||
337 | kfree(controller); | ||
338 | return; | ||
339 | } | 330 | } |
340 | 331 | ||
341 | /* | 332 | /* |