PCI: rockchip: Use pci_host_probe() to register host

The rockchip 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-14-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Shawn Lin <shawn.lin@rock-chips.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index 94af6f5..6a3c844 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -949,7 +949,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
 {
        struct rockchip_pcie *rockchip;
        struct device *dev = &pdev->dev;
-       struct pci_bus *bus, *child;
        struct pci_host_bridge *bridge;
        struct resource *bus_res;
        int err;
@@ -1015,20 +1014,10 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
        bridge->map_irq = of_irq_parse_and_map_pci;
        bridge->swizzle_irq = pci_common_swizzle;
 
-       err = pci_scan_root_bus_bridge(bridge);
+       err = pci_host_probe(bridge);
        if (err < 0)
                goto err_remove_irq_domain;
 
-       bus = bridge->bus;
-
-       rockchip->root_bus = 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;
 
 err_remove_irq_domain:
@@ -1051,9 +1040,10 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
+       struct pci_host_bridge *bridge = pci_host_bridge_from_priv(rockchip);
 
-       pci_stop_root_bus(rockchip->root_bus);
-       pci_remove_root_bus(rockchip->root_bus);
+       pci_stop_root_bus(bridge->bus);
+       pci_remove_root_bus(bridge->bus);
        irq_domain_remove(rockchip->irq_domain);
 
        rockchip_pcie_deinit_phys(rockchip);

diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h
index d90dfb3..4012543 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip.h
+++ b/drivers/pci/controller/pcie-rockchip.h
@@ -303,7 +303,6 @@ struct rockchip_pcie {
        struct  device *dev;
        struct  irq_domain *irq_domain;
        int     offset;
-       struct pci_bus *root_bus;
        void    __iomem *msg_region;
        phys_addr_t msg_bus_addr;
        bool is_rc;