* [PATCH v3, part1 05/10] PCI, IA64: minor code clean up
[not found] <1369489718-25869-1-git-send-email-jiang.liu@huawei.com>
@ 2013-05-25 13:48 ` Jiang Liu
0 siblings, 0 replies; only message in thread
From: Jiang Liu @ 2013-05-25 13:48 UTC (permalink / raw)
To: Bjorn Helgaas, Yinghai Lu
Cc: Jiang Liu, Rafael J . Wysocki, Greg Kroah-Hartman, Gu Zheng,
Toshi Kani, Myron Stowe, Yijing Wang, Jiang Liu, linux-pci,
linux-kernel, Tony Luck, Fenghua Yu, linux-ia64
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>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
arch/ia64/sn/kernel/io_init.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 238e2c5..e2c7733 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);
}
/*
--
1.8.1.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-25 13:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1369489718-25869-1-git-send-email-jiang.liu@huawei.com>
2013-05-25 13:48 ` [PATCH v3, part1 05/10] PCI, IA64: minor code clean up Jiang Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox