]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
PCI: aardvark: Convert to use pci_host_probe()
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>
Fri, 29 Jun 2018 09:16:20 +0000 (11:16 +0200)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Fri, 6 Jul 2018 12:11:35 +0000 (13:11 +0100)
Part of advk_pcie_probe() is exactly an open-coded version of
pci_host_probe(). So instead of duplicating this code, use
pci_host_probe() directly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[lorenzo.pieralisi@arm.com: updated commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
drivers/pci/controller/pci-aardvark.c

index 10543ed7b500a0a55cad5f2630cb2a67f52d606e..d5030cd0619742b29156eff2947db24098fd4af7 100644 (file)
@@ -843,7 +843,6 @@ static int advk_pcie_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct advk_pcie *pcie;
        struct resource *res;
-       struct pci_bus *bus, *child;
        struct pci_host_bridge *bridge;
        int ret, irq;
 
@@ -897,22 +896,13 @@ static int advk_pcie_probe(struct platform_device *pdev)
        bridge->map_irq = of_irq_parse_and_map_pci;
        bridge->swizzle_irq = pci_common_swizzle;
 
-       ret = pci_scan_root_bus_bridge(bridge);
+       ret = pci_host_probe(bridge);
        if (ret < 0) {
                advk_pcie_remove_msi_irq_domain(pcie);
                advk_pcie_remove_irq_domain(pcie);
                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;
 }