diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2011-10-29 00:27:22 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 21:11:06 +0100 |
| commit | 42605fa6665ea86bbbd4de61693a0b002830277b (patch) | |
| tree | f2a150c54c2ec14725a2ea2f5dd007194839dd43 /drivers/parisc/lba_pci.c | |
| parent | parisc/PCI: lba: deal with LMMIO/PAT overlaps before creating PCI root bus (diff) | |
| download | linux-42605fa6665ea86bbbd4de61693a0b002830277b.tar.xz linux-42605fa6665ea86bbbd4de61693a0b002830277b.zip | |
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/lba_pci.c')
| -rw-r--r-- | drivers/parisc/lba_pci.c | 14 |
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) 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; |