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

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

PCI: Make pci_register_host_bridge() PCI core internal 



With the introduction of pci_scan_root_bus_bridge() there is no need to
export pci_register_host_bridge() to other kernel subsystems other than the
PCI compilation unit that needs it.

Make pci_register_host_bridge() static to its compilation unit and convert
the existing drivers usage over to pci_scan_root_bus_bridge().

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>
parent 1228c4b6

drivers/pci/host/pci-ftpci100.c

+2 −3
Original line number Diff line number Diff line
@@ -527,14 +527,13 @@ static int faraday_pci_probe(struct platform_device *pdev) 
		return ret;



	list_splice_init(&res, &host->windows);

	ret = pci_register_host_bridge(host);

	ret = pci_scan_root_bus_bridge(host);

	if (ret) {

		dev_err(dev, "failed to register host: %d\n", ret);

		dev_err(dev, "failed to scan host: %d\n", ret);

		return ret;

	}

	p->bus = host->bus;



	pci_scan_child_bus(p->bus);

	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);

	pci_bus_assign_resources(p->bus);

	pci_bus_add_devices(p->bus);

drivers/pci/host/pci-tegra.c

+1 −3
Original line number Diff line number Diff line
@@ -2285,14 +2285,12 @@ static int tegra_pcie_probe(struct platform_device *pdev) 
	host->dev.parent = &pdev->dev;

	host->ops = &tegra_pcie_ops;



	err = pci_register_host_bridge(host);

	err = pci_scan_root_bus_bridge(host);

	if (err < 0) {

		dev_err(dev, "failed to register host: %d\n", err);

		goto disable_msi;

	}



	pci_scan_child_bus(host->bus);



	pci_fixup_irqs(pci_common_swizzle, tegra_pcie_map_irq);

	pci_bus_size_bridges(host->bus);

	pci_bus_assign_resources(host->bus);

drivers/pci/probe.c

+1 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) 
	dev_set_msi_domain(&bus->dev, d);

}



int pci_register_host_bridge(struct pci_host_bridge *bridge)

static int pci_register_host_bridge(struct pci_host_bridge *bridge)

{

	struct device *parent = bridge->dev.parent;

	struct resource_entry *window, *n;
@@ -861,7 +861,6 @@ int pci_register_host_bridge(struct pci_host_bridge *bridge) 
	kfree(bus);

	return err;

}

EXPORT_SYMBOL(pci_register_host_bridge);



static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,

					   struct pci_dev *bridge, int busnr)

include/linux/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -461,7 +461,6 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv); 
struct pci_host_bridge *devm_pci_alloc_host_bridge(struct device *dev,

						   size_t priv);

void pci_free_host_bridge(struct pci_host_bridge *bridge);

int pci_register_host_bridge(struct pci_host_bridge *bridge);

struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus);



void pci_set_host_bridge_release(struct pci_host_bridge *bridge,