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

Commit 9ee8a1c4 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas
Browse files

PCI: Remove pci_scan_root_bus_msi() 



The pci_scan_root_bus_bridge() function allows passing a parameterized
struct pci_host_bridge and scanning the resulting PCI bus; since the struct
msi_controller is part of the struct pci_host_bridge and the struct
pci_host_bridge can now be passed to pci_scan_root_bus_bridge() explicitly,
there is no need for a scan interface with a MSI controller parameter.

With all PCI host controller drivers and platform code relying on
pci_scan_root_bus_msi() converted over to pci_scan_root_bus_bridge() the
pci_scan_root_bus_msi() becomes obsolete and can be removed.

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 123db533

drivers/pci/probe.c

+5 −22
Original line number Diff line number Diff line
@@ -2324,9 +2324,8 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) 
{

}



static struct pci_bus *pci_create_root_bus_msi(struct device *parent,

		int bus, struct pci_ops *ops, void *sysdata,

		struct list_head *resources, struct msi_controller *msi)

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

		struct pci_ops *ops, void *sysdata, struct list_head *resources)

{

	int error;

	struct pci_host_bridge *bridge;
@@ -2341,7 +2340,6 @@ static struct pci_bus *pci_create_root_bus_msi(struct device *parent, 
	bridge->sysdata = sysdata;

	bridge->busnr = bus;

	bridge->ops = ops;

	bridge->msi = msi;



	error = pci_register_host_bridge(bridge);

	if (error < 0)
@@ -2353,13 +2351,6 @@ static struct pci_bus *pci_create_root_bus_msi(struct device *parent, 
	kfree(bridge);

	return NULL;

}



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

		struct pci_ops *ops, void *sysdata, struct list_head *resources)

{

	return pci_create_root_bus_msi(parent, bus, ops, sysdata, resources,

				       NULL);

}

EXPORT_SYMBOL_GPL(pci_create_root_bus);



int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
@@ -2464,9 +2455,8 @@ int pci_scan_root_bus_bridge(struct pci_host_bridge *bridge) 
}

EXPORT_SYMBOL(pci_scan_root_bus_bridge);



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

		struct pci_ops *ops, void *sysdata,

		struct list_head *resources, struct msi_controller *msi)

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

		struct pci_ops *ops, void *sysdata, struct list_head *resources)

{

	struct resource_entry *window;

	bool found = false;
@@ -2479,7 +2469,7 @@ struct pci_bus *pci_scan_root_bus_msi(struct device *parent, int bus, 
			break;

		}



	b = pci_create_root_bus_msi(parent, bus, ops, sysdata, resources, msi);

	b = pci_create_root_bus(parent, bus, ops, sysdata, resources);

	if (!b)

		return NULL;
@@ -2497,13 +2487,6 @@ struct pci_bus *pci_scan_root_bus_msi(struct device *parent, int bus, 


	return b;

}



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

		struct pci_ops *ops, void *sysdata, struct list_head *resources)

{

	return pci_scan_root_bus_msi(parent, bus, ops, sysdata, resources,

				     NULL);

}

EXPORT_SYMBOL(pci_scan_root_bus);



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

include/linux/pci.h

+0 −4
Original line number Diff line number Diff line
@@ -849,10 +849,6 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, 
int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);

int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);

void pci_bus_release_busn_res(struct pci_bus *b);

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

				      struct pci_ops *ops, void *sysdata,

				      struct list_head *resources,

				      struct msi_controller *msi);

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

					     struct pci_ops *ops, void *sysdata,

					     struct list_head *resources);