From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Oct 2011 22:26:26 +0000 (-0600)
Subject: ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()
X-Git-Tag: v3.3-rc1~101^2~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=79e77f27f52264768a393f8bafb548d3776f993e;p=linux.git

ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()

This doesn't change any functionality, but it makes a subsequent patch
slightly simpler.

CC: Tony Luck <tony.luck@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 99f232c50bd1..3f9c86ad00fa 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -387,8 +387,11 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
 	 * should handle the case here, but it appears that IA64 hasn't
 	 * such quirk. So we just ignore the case now.
 	 */
-	pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);
+	pbus = pci_create_bus(NULL, bus, &pci_root_ops, controller);
+	if (!pbus)
+		return NULL;
 
+	pbus->subordinate = pci_scan_child_bus(pbus);
 	return pbus;
 
 out3: