Commit 1df79305 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Convert to use pci_host_probe() 

Now that there are no more .scan_bus() callbacks, we can remove it and just
use pci_host_probe().

Link: https://lore.kernel.org/r/20200821035420.380495-17-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
parent 6ab15b5e

drivers/pci/controller/dwc/pcie-designware-host.c

+3 −18
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	struct device_node *np = dev->of_node;

	struct platform_device *pdev = to_platform_device(dev);

	struct resource_entry *win;

	struct pci_bus *child;

	struct pci_host_bridge *bridge;

	struct resource *cfg_res;

	int ret;
@@ -436,22 +435,8 @@ int dw_pcie_host_init(struct pcie_port *pp) 


	bridge->sysdata = pp;



	ret = pci_scan_root_bus_bridge(bridge);

	if (ret)

		goto err_free_msi;



	pp->root_bus = bridge->bus;



	if (pp->ops->scan_bus)

		pp->ops->scan_bus(pp);



	pci_bus_size_bridges(pp->root_bus);

	pci_bus_assign_resources(pp->root_bus);



	list_for_each_entry(child, &pp->root_bus->children, node)

		pcie_bus_configure_settings(child);



	pci_bus_add_devices(pp->root_bus);

	ret = pci_host_probe(bridge);

	if (!ret)

		return 0;



err_free_msi:

drivers/pci/controller/dwc/pcie-designware.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ enum dw_pcie_device_mode { 


struct dw_pcie_host_ops {

	int (*host_init)(struct pcie_port *pp);

	void (*scan_bus)(struct pcie_port *pp);

	void (*set_num_vectors)(struct pcie_port *pp);

	int (*msi_host_init)(struct pcie_port *pp);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE