]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Oct 2011 22:26:26 +0000 (16:26 -0600)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 6 Jan 2012 20:10:58 +0000 (12:10 -0800)
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>
arch/ia64/pci/pci.c

index 99f232c50bd1310cd5ed802824cca9b515a4039f..3f9c86ad00faa8cc563ff9623cdd55121a38d6ed 100644 (file)
@@ -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: