Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4e06576 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

parisc/PCI: dino: 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: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 9a458001

drivers/parisc/dino.c

+12 −10
Original line number Original line Diff line number Diff line
@@ -1007,22 +1007,24 @@ static int __init dino_probe(struct parisc_device *dev) 
	** It's not used to avoid chicken/egg problems

	** It's not used to avoid chicken/egg problems

	** with configuration accessor functions.

	** with configuration accessor functions.

	*/

	*/

	dino_dev->hba.hba_bus = bus = pci_scan_bus_parented(&dev->dev,

	dino_dev->hba.hba_bus = bus = pci_create_bus(&dev->dev,

			 dino_current_bus, &dino_cfg_ops, NULL);

			 dino_current_bus, &dino_cfg_ops, NULL);

	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);

		/* increment the bus number in case of duplicates */

		dino_current_bus++;

		return 0;

	}



	bus->subordinate = pci_scan_child_bus(bus);





	if(bus) {

	/* This code *depends* on scanning being single threaded

	/* This code *depends* on scanning being single threaded

	 * if it isn't, this global bus number count will fail

	 * if it isn't, this global bus number count will fail

	 */

	 */

	dino_current_bus = bus->subordinate + 1;

	dino_current_bus = bus->subordinate + 1;

	pci_bus_assign_resources(bus);

	pci_bus_assign_resources(bus);

	pci_bus_add_devices(bus);

	pci_bus_add_devices(bus);

	} else {

		printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",

		       dev_name(&dev->dev), dino_current_bus);

		/* increment the bus number in case of duplicates */

		dino_current_bus++;

	}

	return 0;

	return 0;

}

}