mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
PCI: dwc: all: Use platform_set_drvdata() to save private data
Add platform_set_drvdata() in all designware-based drivers to store the private data structure of the driver so that dev_set_drvdata() can be used to get back private data structure in add_pcie_port/host_init. This is in preparation for splitting struct pcie_port into core and host only structures. After the split pcie_port will not be part of the driver's private data structure and *container_of* used now to get the private data pointer cannot be used. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Jingoo Han <jingoohan1@gmail.com> CC: Richard Zhu <hongxing.zhu@nxp.com> CC: Lucas Stach <l.stach@pengutronix.de> CC: Murali Karicheri <m-karicheri2@ti.com> CC: Minghuan Lian <minghuan.Lian@freescale.com> CC: Mingkai Hu <mingkai.hu@freescale.com> CC: Roy Zang <tie-fei.zang@freescale.com> CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> CC: Niklas Cassel <niklas.cassel@axis.com> CC: Jesper Nilsson <jesper.nilsson@axis.com> CC: Joao Pinto <Joao.Pinto@synopsys.com> CC: Zhou Wang <wangzhou1@hisilicon.com> CC: Gabriele Paoloni <gabriele.paoloni@huawei.com> CC: Stanimir Varbanov <svarbanov@mm-sol.com> CC: Pratyush Anand <pratyush.anand@gmail.com>
This commit is contained in:
parent
b90dc39221
commit
9bcf0a6fdc
11 changed files with 22 additions and 4 deletions
|
@ -433,6 +433,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, dra7xx);
|
||||||
|
|
||||||
pm_runtime_enable(dev);
|
pm_runtime_enable(dev);
|
||||||
ret = pm_runtime_get_sync(dev);
|
ret = pm_runtime_get_sync(dev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -459,7 +461,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_gpio;
|
goto err_gpio;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, dra7xx);
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_gpio:
|
err_gpio:
|
||||||
|
|
|
@ -583,11 +583,12 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)
|
||||||
goto fail_bus_clk;
|
goto fail_bus_clk;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, exynos_pcie);
|
||||||
|
|
||||||
ret = exynos_add_pcie_port(exynos_pcie, pdev);
|
ret = exynos_add_pcie_port(exynos_pcie, pdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto fail_bus_clk;
|
goto fail_bus_clk;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, exynos_pcie);
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_bus_clk:
|
fail_bus_clk:
|
||||||
|
|
|
@ -719,11 +719,12 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
|
||||||
if (ret)
|
if (ret)
|
||||||
imx6_pcie->link_gen = 1;
|
imx6_pcie->link_gen = 1;
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, imx6_pcie);
|
||||||
|
|
||||||
ret = imx6_add_pcie_port(imx6_pcie, pdev);
|
ret = imx6_add_pcie_port(imx6_pcie, pdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, imx6_pcie);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -422,6 +422,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, ks_pcie);
|
||||||
|
|
||||||
ret = ks_add_pcie_port(ks_pcie, pdev);
|
ret = ks_add_pcie_port(ks_pcie, pdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto fail_clk;
|
goto fail_clk;
|
||||||
|
|
|
@ -268,6 +268,8 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
|
||||||
if (!ls_pcie_is_bridge(pcie))
|
if (!ls_pcie_is_bridge(pcie))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, pcie);
|
||||||
|
|
||||||
ret = ls_add_pcie_port(pcie);
|
ret = ls_add_pcie_port(pcie);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -226,6 +226,8 @@ static int armada8k_pcie_probe(struct platform_device *pdev)
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, pcie);
|
||||||
|
|
||||||
ret = armada8k_add_pcie_port(pcie, pdev);
|
ret = armada8k_add_pcie_port(pcie, pdev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
@ -261,6 +261,8 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(artpec6_pcie->regmap))
|
if (IS_ERR(artpec6_pcie->regmap))
|
||||||
return PTR_ERR(artpec6_pcie->regmap);
|
return PTR_ERR(artpec6_pcie->regmap);
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, artpec6_pcie);
|
||||||
|
|
||||||
ret = artpec6_add_pcie_port(artpec6_pcie, pdev);
|
ret = artpec6_add_pcie_port(artpec6_pcie, pdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -104,6 +104,8 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(pp->dbi_base))
|
if (IS_ERR(pp->dbi_base))
|
||||||
return PTR_ERR(pp->dbi_base);
|
return PTR_ERR(pp->dbi_base);
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, dw_plat_pcie);
|
||||||
|
|
||||||
ret = dw_plat_add_pcie_port(pp, pdev);
|
ret = dw_plat_add_pcie_port(pp, pdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -287,6 +287,8 @@ static int hisi_pcie_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(pp->dbi_base))
|
if (IS_ERR(pp->dbi_base))
|
||||||
return PTR_ERR(pp->dbi_base);
|
return PTR_ERR(pp->dbi_base);
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, hisi_pcie);
|
||||||
|
|
||||||
ret = hisi_add_pcie_port(hisi_pcie, pdev);
|
ret = hisi_add_pcie_port(hisi_pcie, pdev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -716,6 +716,8 @@ static int qcom_pcie_probe(struct platform_device *pdev)
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, pcie);
|
||||||
|
|
||||||
ret = dw_pcie_host_init(pp);
|
ret = dw_pcie_host_init(pp);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "cannot initialize host\n");
|
dev_err(dev, "cannot initialize host\n");
|
||||||
|
|
|
@ -270,11 +270,12 @@ static int spear13xx_pcie_probe(struct platform_device *pdev)
|
||||||
if (of_property_read_bool(np, "st,pcie-is-gen1"))
|
if (of_property_read_bool(np, "st,pcie-is-gen1"))
|
||||||
spear13xx_pcie->is_gen1 = true;
|
spear13xx_pcie->is_gen1 = true;
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, spear13xx_pcie);
|
||||||
|
|
||||||
ret = spear13xx_add_pcie_port(spear13xx_pcie, pdev);
|
ret = spear13xx_add_pcie_port(spear13xx_pcie, pdev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto fail_clk;
|
goto fail_clk;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, spear13xx_pcie);
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_clk:
|
fail_clk:
|
||||||
|
|
Loading…
Reference in a new issue