Commit 78aada4b authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: xilinx: Use pci_host_probe() to register host 

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

The only difference is pci_assign_unassigned_bus_resources() was called
instead of pci_bus_size_bridges() and pci_bus_assign_resources(). This
should be the same.

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


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Michal Simek <michal.simek@xilinx.com>
parent dd58950f

drivers/pci/controller/pcie-xilinx.c

+1 −12
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct xilinx_pcie_port *port;

	struct pci_bus *bus, *child;

	struct pci_host_bridge *bridge;

	int err;
@@ -663,17 +662,7 @@ static int xilinx_pcie_probe(struct platform_device *pdev) 
	xilinx_pcie_msi_chip.dev = dev;

	bridge->msi = &xilinx_pcie_msi_chip;

#endif

	err = pci_scan_root_bus_bridge(bridge);

	if (err < 0)

		return err;



	bus = bridge->bus;



	pci_assign_unassigned_bus_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 const struct of_device_id xilinx_pcie_of_match[] = {