[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111014042828.23504.61212.stgit@bhelgaas.mtv.corp.google.com>
Date: Thu, 13 Oct 2011 22:28:28 -0600
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: linux-pci@...r.kernel.org
Cc: linux-arch@...r.kernel.org, Tony Luck <tony.luck@...el.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 16/29] 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@...el.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
arch/ia64/pci/pci.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index aa2533a..d7e47a9 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -386,8 +386,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, NULL);
+ if (!pbus)
+ return NULL;
+ pbus->subordinate = pci_scan_child_bus(pbus);
return pbus;
out3:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists