After all users of pci_root_buses external to PCI core have been converted to using pci_find_next_bus(), move its declaration to the PCI core code and stop exporting the symbol.
Signed-off-by: Gerd Bayer <[email protected]> --- drivers/pci/pci.h | 3 +++ drivers/pci/probe.c | 2 -- include/linux/pci.h | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4a14f88e543a..1f36d400c9e0 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -366,6 +366,9 @@ static inline void pci_create_legacy_files(struct pci_bus *bus) { } static inline void pci_remove_legacy_files(struct pci_bus *bus) { } #endif +/* List of all known PCI buses */ +extern struct list_head pci_root_buses; + /* Lock for read/write access to pci device and bus lists */ extern struct rw_semaphore pci_bus_sem; extern struct mutex pci_slot_mutex; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b63cd0c310bc..2e97ab125ead 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -33,9 +33,7 @@ static struct resource busn_resource = { .flags = IORESOURCE_BUS, }; -/* Ugh. Need to stop exporting this to modules. */ LIST_HEAD(pci_root_buses); -EXPORT_SYMBOL(pci_root_buses); static LIST_HEAD(pci_domain_busn_res_list); diff --git a/include/linux/pci.h b/include/linux/pci.h index 2c4454583c11..1c4610848b5c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1192,10 +1192,6 @@ extern enum pcie_bus_config_types pcie_bus_config; extern const struct bus_type pci_bus_type; -/* Do NOT directly access these two variables, unless you are arch-specific PCI - * code, or PCI core code. */ -extern struct list_head pci_root_buses; /* List of all known PCI buses */ - void pcibios_resource_survey_bus(struct pci_bus *bus); void pcibios_bus_add_device(struct pci_dev *pdev); void pcibios_add_bus(struct pci_bus *bus); -- 2.54.0
