PCI: v3: Use pci_host_probe() to register host
authorRob Herring <robh@kernel.org>
Fri, 22 May 2020 23:48:24 +0000 (17:48 -0600)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Fri, 10 Jul 2020 10:50:23 +0000 (11:50 +0100)
The v3 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-8-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
drivers/pci/controller/pci-v3-semi.c

index 3681e5a..198cf2c 100644 (file)
@@ -239,7 +239,6 @@ struct v3_pci {
        struct device *dev;
        void __iomem *base;
        void __iomem *config_base;
-       struct pci_bus *bus;
        u32 config_mem;
        u32 non_pre_mem;
        u32 pre_mem;
@@ -904,17 +903,7 @@ static int v3_pci_probe(struct platform_device *pdev)
        val |= V3_SYSTEM_M_LOCK;
        writew(val, v3->base + V3_SYSTEM);
 
-       ret = pci_scan_root_bus_bridge(host);
-       if (ret) {
-               dev_err(dev, "failed to register host: %d\n", ret);
-               return ret;
-       }
-       v3->bus = host->bus;
-
-       pci_bus_assign_resources(v3->bus);
-       pci_bus_add_devices(v3->bus);
-
-       return 0;
+       return pci_host_probe(host);
 }
 
 static const struct of_device_id v3_pci_of_match[] = {