Skip to content

Commit

Permalink
parisc/PCI: lba: use pci_create_bus() instead of pci_scan_bus_parented()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Jesse Barnes committed Jan 6, 2012
1 parent f4d9ea9 commit 42605fa
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/parisc/lba_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 42605fa

Please sign in to comment.