summaryrefslogtreecommitdiffstats
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2011-10-28 16:26:26 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-01-06 12:10:58 -0800
commit79e77f27f52264768a393f8bafb548d3776f993e (patch)
tree795d5a30305717b64ed1955452231229bf43098b /arch/ia64/pci
parente2a7965ee07360c448ffa4eb3d5ccee01c42251e (diff)
downloadop-kernel-dev-79e77f27f52264768a393f8bafb548d3776f993e.zip
op-kernel-dev-79e77f27f52264768a393f8bafb548d3776f993e.tar.gz
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>
Diffstat (limited to 'arch/ia64/pci')
-rw-r--r--arch/ia64/pci/pci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 99f232c..3f9c86a 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:
OpenPOWER on IntegriCloud