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

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

PCI: convert pci_scan_bus() to use pci_create_root_bus() 



I plan to deprecate pci_scan_bus_parented(), so use pci_create_root_bus()
directly instead.  pci_scan_bus() itself will be removed as soon as all
callers are gone, so this is just an interim step.

v2: export pci_scan_bus

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent a2ebb827

drivers/pci/probe.c

+19 −0
Original line number Diff line number Diff line
@@ -1649,6 +1649,25 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, 
}

EXPORT_SYMBOL(pci_scan_bus_parented);



struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,

					void *sysdata)

{

	LIST_HEAD(resources);

	struct pci_bus *b;



	pci_add_resource(&resources, &ioport_resource);

	pci_add_resource(&resources, &iomem_resource);

	b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources);

	if (b) {

		b->subordinate = pci_scan_child_bus(b);

		pci_bus_add_devices(b);

	} else {

		pci_free_resource_list(&resources);

	}

	return b;

}

EXPORT_SYMBOL(pci_scan_bus);



#ifdef CONFIG_HOTPLUG

/**

 * pci_rescan_bus - scan a PCI bus for devices.

include/linux/pci.h

+1 −9
Original line number Diff line number Diff line
@@ -661,15 +661,7 @@ extern struct pci_bus *pci_find_bus(int domain, int busnr); 
void pci_bus_add_devices(const struct pci_bus *bus);

struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,

				      struct pci_ops *ops, void *sysdata);

static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,

					   void *sysdata)

{

	struct pci_bus *root_bus;

	root_bus = pci_scan_bus_parented(NULL, bus, ops, sysdata);

	if (root_bus)

		pci_bus_add_devices(root_bus);

	return root_bus;

}

struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);

struct pci_bus *pci_create_root_bus(struct device *parent, int bus,

				    struct pci_ops *ops, void *sysdata,

				    struct list_head *resources);