Commit 56d29234 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: rcar: Use pci_host_probe() to register host 

The rcar host driver does the same host registration and bus scanning
calls as pci_host_probe, so let's use it instead.

Link: https://lore.kernel.org/r/20200522234832.954484-13-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: linux-renesas-soc@vger.kernel.org
parent 81ce3cf4

drivers/pci/controller/pcie-rcar-host.c

+1 −17
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ static int rcar_pcie_enable(struct rcar_pcie_host *host) 
	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(host);

	struct rcar_pcie *pcie = &host->pcie;

	struct device *dev = pcie->dev;

	struct pci_bus *bus, *child;

	int ret;



	/* Try setting 5 GT/s link speed */

	rcar_pcie_force_speedup(pcie);
@@ -349,21 +347,7 @@ static int rcar_pcie_enable(struct rcar_pcie_host *host) 
	if (IS_ENABLED(CONFIG_PCI_MSI))

		bridge->msi = &host->msi.chip;



	ret = pci_scan_root_bus_bridge(bridge);

	if (ret < 0)

		return ret;



	bus = bridge->bus;



	pci_bus_size_bridges(bus);

	pci_bus_assign_resources(bus);



	list_for_each_entry(child, &bus->children, node)

		pcie_bus_configure_settings(child);



	pci_bus_add_devices(bus);



	return 0;

	return pci_host_probe(bridge);

}



static int phy_wait_for_ack(struct rcar_pcie *pcie)