Skip to content

Commit 873883f

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: mvebu: Remove custom mvebu_pci_host_probe() function
Now after pci_ioremap_io() usage was replaced by devm_pci_remap_iospace() function, there is no need to use custom mvebu_pci_host_probe() function. Current implementation of mvebu_pci_host_probe() is same as standard PCI core function pci_host_probe(). So replace mvebu_pci_host_probe() call by pci_host_probe() and remove custom mvebu_pci_host_probe() function. Link: https://lore.kernel.org/r/20211124154116.916-4-pali@kernel.org Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
1 parent c1aa4b5 commit 873883f

1 file changed

Lines changed: 1 addition & 40 deletions

File tree

drivers/pci/controller/pci-mvebu.c

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,45 +1005,6 @@ static int mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie)
10051005
return 0;
10061006
}
10071007

1008-
/*
1009-
* This is a copy of pci_host_probe(), except that it does the I/O
1010-
* remap as the last step, once we are sure we won't fail.
1011-
*
1012-
* It should be removed once the I/O remap error handling issue has
1013-
* been sorted out.
1014-
*/
1015-
static int mvebu_pci_host_probe(struct pci_host_bridge *bridge)
1016-
{
1017-
struct pci_bus *bus, *child;
1018-
int ret;
1019-
1020-
ret = pci_scan_root_bus_bridge(bridge);
1021-
if (ret < 0) {
1022-
dev_err(bridge->dev.parent, "Scanning root bridge failed");
1023-
return ret;
1024-
}
1025-
1026-
bus = bridge->bus;
1027-
1028-
/*
1029-
* We insert PCI resources into the iomem_resource and
1030-
* ioport_resource trees in either pci_bus_claim_resources()
1031-
* or pci_bus_assign_resources().
1032-
*/
1033-
if (pci_has_flag(PCI_PROBE_ONLY)) {
1034-
pci_bus_claim_resources(bus);
1035-
} else {
1036-
pci_bus_size_bridges(bus);
1037-
pci_bus_assign_resources(bus);
1038-
1039-
list_for_each_entry(child, &bus->children, node)
1040-
pcie_bus_configure_settings(child);
1041-
}
1042-
1043-
pci_bus_add_devices(bus);
1044-
return 0;
1045-
}
1046-
10471008
static int mvebu_pcie_probe(struct platform_device *pdev)
10481009
{
10491010
struct device *dev = &pdev->dev;
@@ -1118,7 +1079,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
11181079
bridge->ops = &mvebu_pcie_ops;
11191080
bridge->align_resource = mvebu_pcie_align_resource;
11201081

1121-
return mvebu_pci_host_probe(bridge);
1082+
return pci_host_probe(bridge);
11221083
}
11231084

11241085
static const struct of_device_id mvebu_pcie_of_match_table[] = {

0 commit comments

Comments
 (0)