PCI: Set default bridge parent device

The host bridge's parent device is always the platform device. As we
already have a pointer to it in the devres functions, let's initialize
the parent device. Drivers can still override the parent if desired.

Link: https://lore.kernel.org/r/20200722022514.1283916-3-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c
index 8809beb..ec41c6d 100644 (file)
--- a/drivers/pci/controller/cadence/pcie-cadence-host.c
+++ b/drivers/pci/controller/cadence/pcie-cadence-host.c
@@ -241,7 +241,6 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)
        if (ret)
                goto err_init;
 
-       bridge->dev.parent = dev;
        bridge->busnr = pcie->bus;
        bridge->ops = &cdns_pcie_host_ops;
        bridge->map_irq = of_irq_parse_and_map_pci;

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 0a4a5aa..4a16306 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -475,7 +475,6 @@ int dw_pcie_host_init(struct pcie_port *pp)
 
        pp->root_bus_nr = pp->busn->start;
 
-       bridge->dev.parent = dev;
        bridge->sysdata = pp;
        bridge->busnr = pp->root_bus_nr;
        bridge->ops = &dw_pcie_ops;

diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
index 5974619..705542b 100644 (file)
--- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
+++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
@@ -605,7 +605,6 @@ int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie)
        }
 
        /* Initialize bridge */
-       bridge->dev.parent = dev;
        bridge->sysdata = pcie;
        bridge->busnr = rp->root_bus_nr;
        bridge->ops = &mobiveil_pcie_ops;

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 0d98f9b..6aaa6ed 100644 (file)
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1183,7 +1183,6 @@ static int advk_pcie_probe(struct platform_device *pdev)
                return ret;
        }
 
-       bridge->dev.parent = dev;
        bridge->sysdata = pcie;
        bridge->busnr = 0;
        bridge->ops = &advk_pcie_ops;

diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
index 221dfc9..db887cb 100644 (file)
--- a/drivers/pci/controller/pci-ftpci100.c
+++ b/drivers/pci/controller/pci-ftpci100.c
@@ -436,7 +436,6 @@ static int faraday_pci_probe(struct platform_device *pdev)
        if (!host)
                return -ENOMEM;
 
-       host->dev.parent = dev;
        host->ops = &faraday_pci_ops;
        host->busnr = 0;
        host->msi = NULL;

diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
index b76e55f..ad395d7 100644 (file)
--- a/drivers/pci/controller/pci-host-common.c
+++ b/drivers/pci/controller/pci-host-common.c
@@ -76,7 +76,6 @@ int pci_host_common_probe(struct platform_device *pdev)
        if (!pci_has_flag(PCI_PROBE_ONLY))
                pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
-       bridge->dev.parent = dev;
        bridge->sysdata = cfg;
        bridge->busnr = cfg->busr.start;
        bridge->ops = (struct pci_ops *)&ops->pci_ops;

diff --git a/drivers/pci/controller/pci-loongson.c b/drivers/pci/controller/pci-loongson.c
index 459009c..0198c15 100644 (file)
--- a/drivers/pci/controller/pci-loongson.c
+++ b/drivers/pci/controller/pci-loongson.c
@@ -225,7 +225,6 @@ static int loongson_pci_probe(struct platform_device *pdev)
                return err;
        }
 
-       bridge->dev.parent = dev;
        bridge->sysdata = priv;
        bridge->ops = &loongson_pci_ops;
        bridge->map_irq = loongson_map_irq;

diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 8010445..7be6db8 100644 (file)
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -1116,7 +1116,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
 
        pcie->nports = i;
 
-       bridge->dev.parent = dev;
        bridge->sysdata = pcie;
        bridge->busnr = 0;
        bridge->ops = &mvebu_pcie_ops;

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index 71bf4b2..41232bd 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -2713,7 +2713,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
        }
 
        host->busnr = bus->start;
-       host->dev.parent = &pdev->dev;
        host->ops = &tegra_pcie_ops;
        host->map_irq = tegra_pcie_map_irq;
        host->swizzle_irq = pci_common_swizzle;

diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index 198cf2c..e8b5e55 100644 (file)
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -723,7 +723,6 @@ static int v3_pci_probe(struct platform_device *pdev)
        if (!host)
                return -ENOMEM;
 
-       host->dev.parent = dev;
        host->ops = &v3_pci_ops;
        host->busnr = 0;
        host->msi = NULL;

diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
index 39ed7a1..ea1889c 100644 (file)
--- a/drivers/pci/controller/pci-versatile.c
+++ b/drivers/pci/controller/pci-versatile.c
@@ -153,7 +153,6 @@ static int versatile_pci_probe(struct platform_device *pdev)
 
        pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
-       bridge->dev.parent = dev;
        bridge->sysdata = NULL;
        bridge->busnr = 0;
        bridge->ops = &pci_versatile_ops;

diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 4c783cf..f02cbd6 100644 (file)
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -623,7 +623,6 @@ static int xgene_pcie_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       bridge->dev.parent = dev;
        bridge->sysdata = port;
        bridge->busnr = 0;
        bridge->ops = &xgene_pcie_ops;

diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
index 4ffe382..4424430 100644 (file)
--- a/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@ -813,7 +813,6 @@ static int altera_pcie_probe(struct platform_device *pdev)
        cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE);
        altera_pcie_host_init(pcie);
 
-       bridge->dev.parent = dev;
        bridge->sysdata = pcie;
        bridge->busnr = pcie->root_bus_nr;
        bridge->ops = &altera_pcie_ops;

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index 91a4b7f..87e9695 100644 (file)
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -994,7 +994,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
                }
        }
 
-       bridge->dev.parent = &pdev->dev;
        bridge->busnr = 0;
        bridge->ops = &brcm_pcie_ops;
        bridge->sysdata = pcie;

diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
index 232fca0..cf1cb71 100644 (file)
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -1524,7 +1524,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
                        dev_info(dev, "not using iProc MSI\n");
 
        host->busnr = 0;
-       host->dev.parent = dev;
        host->ops = &iproc_pcie_ops;
        host->sysdata = pcie;
        host->map_irq = pcie->map_irq;

diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index d8e3827..a9399b8 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -1095,7 +1095,6 @@ static int mtk_pcie_probe(struct platform_device *pdev)
                return err;
 
        host->busnr = pcie->busnr;
-       host->dev.parent = pcie->dev;
        host->ops = pcie->soc->ops;
        host->map_irq = of_irq_parse_and_map_pci;
        host->swizzle_irq = pci_common_swizzle;

diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
index 9069ad9..3a8e749 100644 (file)
--- a/drivers/pci/controller/pcie-rcar-host.c
+++ b/drivers/pci/controller/pcie-rcar-host.c
@@ -329,7 +329,6 @@ static int rcar_pcie_enable(struct rcar_pcie_host *host)
 {
        struct pci_host_bridge *bridge = pci_host_bridge_from_priv(host);
        struct rcar_pcie *pcie = &host->pcie;
-       struct device *dev = pcie->dev;
 
        /* Try setting 5 GT/s link speed */
        rcar_pcie_force_speedup(pcie);
@@ -338,7 +337,6 @@ static int rcar_pcie_enable(struct rcar_pcie_host *host)
 
        pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
-       bridge->dev.parent = dev;
        bridge->sysdata = host;
        bridge->busnr = host->root_bus_nr;
        bridge->ops = &rcar_pcie_ops;

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index 6a3c844..4eb79c6 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -1007,7 +1007,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
                goto err_remove_irq_domain;
        }
 
-       bridge->dev.parent = dev;
        bridge->sysdata = rockchip;
        bridge->busnr = 0;
        bridge->ops = &rockchip_pcie_ops;

diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index 32a0b08..3c747aa 100644 (file)
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -854,7 +854,6 @@ static int nwl_pcie_probe(struct platform_device *pdev)
                return err;
        }
 
-       bridge->dev.parent = dev;
        bridge->sysdata = pcie;
        bridge->busnr = pcie->root_busno;
        bridge->ops = &nwl_pcie_ops;

diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
index 0554749..7c0f326 100644 (file)
--- a/drivers/pci/controller/pcie-xilinx.c
+++ b/drivers/pci/controller/pcie-xilinx.c
@@ -651,7 +651,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
                return err;
        }
 
-       bridge->dev.parent = dev;
        bridge->sysdata = port;
        bridge->busnr = 0;
        bridge->ops = &xilinx_pcie_ops;

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2f66988..5583037 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -628,6 +628,8 @@ struct pci_host_bridge *devm_pci_alloc_host_bridge(struct device *dev,
        if (!bridge)
                return NULL;
 
+       bridge->dev.parent = dev;
+
        ret = devm_add_action_or_reset(dev, devm_pci_alloc_host_bridge_release,
                                       bridge);
        if (ret)