mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
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: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
a2ebb82795
commit
de4b2f76d6
2 changed files with 20 additions and 9 deletions
|
@ -1649,6 +1649,25 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pci_scan_bus_parented);
|
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
|
#ifdef CONFIG_HOTPLUG
|
||||||
/**
|
/**
|
||||||
* pci_rescan_bus - scan a PCI bus for devices.
|
* pci_rescan_bus - scan a PCI bus for devices.
|
||||||
|
|
|
@ -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);
|
void pci_bus_add_devices(const struct pci_bus *bus);
|
||||||
struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
|
struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
|
||||||
struct pci_ops *ops, void *sysdata);
|
struct pci_ops *ops, void *sysdata);
|
||||||
static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,
|
struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
|
||||||
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_create_root_bus(struct device *parent, int bus,
|
struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
|
||||||
struct pci_ops *ops, void *sysdata,
|
struct pci_ops *ops, void *sysdata,
|
||||||
struct list_head *resources);
|
struct list_head *resources);
|
||||||
|
|
Loading…
Reference in a new issue