parisc/PCI: lba: use pci_create_bus() instead of pci_scan_bus_parented()
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Oct 2011 22:27:22 +0000 (16:27 -0600)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 6 Jan 2012 20:11:06 +0000 (12:11 -0800)
No functional change here; just converting from pci_scan_bus_parented()
to pci_create_bus() to make a future patch simpler.

CC: linux-parisc@vger.kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/parisc/lba_pci.c

index 2c7edf3..e5dfa25 100644 (file)
@@ -1521,8 +1521,12 @@ lba_driver_probe(struct parisc_device *dev)
 
        dev->dev.platform_data = lba_dev;
        lba_bus = lba_dev->hba.hba_bus =
-               pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start,
-                               cfg_ops, NULL);
+               pci_create_bus(&dev->dev, lba_dev->hba.bus_num.start,
+                              cfg_ops, NULL);
+       if (!lba_bus)
+               return 0;
+
+       lba_bus->subordinate = pci_scan_child_bus(lba_bus);
 
        /* This is in lieu of calling pci_assign_unassigned_resources() */
        if (is_pdc_pat()) {
@@ -1552,10 +1556,8 @@ lba_driver_probe(struct parisc_device *dev)
                lba_dev->flags |= LBA_FLAG_SKIP_PROBE;
        }
 
-       if (lba_bus) {
-               lba_next_bus = lba_bus->subordinate + 1;
-               pci_bus_add_devices(lba_bus);
-       }
+       lba_next_bus = lba_bus->subordinate + 1;
+       pci_bus_add_devices(lba_bus);
 
        /* Whew! Finally done! Tell services we got this one covered. */
        return 0;