From: Yijing Wang <wangyijing0307@xxxxxxxxx> Now pci_bus_add_devices() has been ripped out from pci_scan_root_bus(), we could use pci_scan_root_bus() instead of pci_create_root_bus() + pci_scan_child_bus() for simplicity. Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> CC: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx> CC: linux-parisc@xxxxxxxxxxxxxxx --- drivers/parisc/dino.c | 6 +++--- drivers/parisc/lba_pci.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 56abc43..146c3ff 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -985,8 +985,8 @@ static int __init dino_probe(struct parisc_device *dev) ** It's not used to avoid chicken/egg problems ** with configuration accessor functions. */ - dino_dev->hba.hba_bus = bus = pci_create_root_bus(&dev->dev, - 0, &dino_cfg_ops, NULL, &resources); + dino_dev->hba.hba_bus = bus = pci_scan_root_bus(&dev->dev, + 0, dino_current_bus, &dino_cfg_ops, NULL, &resources); if (!bus) { printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n", dev_name(&dev->dev), dino_current_bus); @@ -996,7 +996,7 @@ static int __init dino_probe(struct parisc_device *dev) return 0; } - max = pci_scan_child_bus(bus); + max = pci_bus_child_max_busnr(bus); pci_bus_update_busn_res_end(bus, max); /* This code *depends* on scanning being single threaded diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 0b9ed96..24e42bf 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -1563,13 +1563,14 @@ lba_driver_probe(struct parisc_device *dev) dev->dev.platform_data = lba_dev; lba_bus = lba_dev->hba.hba_bus = - pci_create_root_bus(&dev->dev, 0, cfg_ops, NULL, &resources); + pci_scan_root_bus(&dev->dev, 0, lba_dev->hba.bus_num.start, + cfg_ops, NULL, &resources); if (!lba_bus) { pci_free_resource_list(&resources); return 0; } - max = pci_scan_child_bus(lba_bus); + max = pci_bus_child_max_busnr(lba_bus); /* This is in lieu of calling pci_assign_unassigned_resources() */ if (is_pdc_pat()) { -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html