aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2011-10-28 18:27:22 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-01-06 15:11:06 -0500
commit42605fa6665ea86bbbd4de61693a0b002830277b (patch)
treef2a150c54c2ec14725a2ea2f5dd007194839dd43 /drivers/parisc
parentf4d9ea9abf04a6ad9643df5497e6243fbf64196e (diff)
parisc/PCI: lba: use pci_create_bus() instead of pci_scan_bus_parented()
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>
Diffstat (limited to 'drivers/parisc')
-rw-r--r--drivers/parisc/lba_pci.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 2c7edf3a6cd0..e5dfa25e2fdd 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -1521,8 +1521,12 @@ lba_driver_probe(struct parisc_device *dev)
1521 1521
1522 dev->dev.platform_data = lba_dev; 1522 dev->dev.platform_data = lba_dev;
1523 lba_bus = lba_dev->hba.hba_bus = 1523 lba_bus = lba_dev->hba.hba_bus =
1524 pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start, 1524 pci_create_bus(&dev->dev, lba_dev->hba.bus_num.start,
1525 cfg_ops, NULL); 1525 cfg_ops, NULL);
1526 if (!lba_bus)
1527 return 0;
1528
1529 lba_bus->subordinate = pci_scan_child_bus(lba_bus);
1526 1530
1527 /* This is in lieu of calling pci_assign_unassigned_resources() */ 1531 /* This is in lieu of calling pci_assign_unassigned_resources() */
1528 if (is_pdc_pat()) { 1532 if (is_pdc_pat()) {
@@ -1552,10 +1556,8 @@ lba_driver_probe(struct parisc_device *dev)
1552 lba_dev->flags |= LBA_FLAG_SKIP_PROBE; 1556 lba_dev->flags |= LBA_FLAG_SKIP_PROBE;
1553 } 1557 }
1554 1558
1555 if (lba_bus) { 1559 lba_next_bus = lba_bus->subordinate + 1;
1556 lba_next_bus = lba_bus->subordinate + 1; 1560 pci_bus_add_devices(lba_bus);
1557 pci_bus_add_devices(lba_bus);
1558 }
1559 1561
1560 /* Whew! Finally done! Tell services we got this one covered. */ 1562 /* Whew! Finally done! Tell services we got this one covered. */
1561 return 0; 1563 return 0;