PCI: dwc: Remove unnecessary wrappers around dw_pcie_host_init()

Many calls to dw_pcie_host_init() are in a wrapper function with
nothing else now. Let's remove the pointless extra layer.

Link: https://lore.kernel.org/r/20201105211159.1814485-14-robh@kernel.org
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Minghuan Lian <minghuan.Lian@nxp.com>
Cc: Mingkai Hu <mingkai.hu@nxp.com>
Cc: Roy Zang <roy.zang@nxp.com>
Cc: Yue Wang <yue.wang@Amlogic.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: Jonathan Chocron <jonnyc@amazon.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Xiaowei Song <songxiaowei@hisilicon.com>
Cc: Binghui Wang <wangbinghui@hisilicon.com>
Cc: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@axis.com

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index f9547bb..0cf1333 100644 (file)
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -842,25 +842,6 @@ static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
        .host_init = imx6_pcie_host_init,
 };
 
-static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
-                             struct platform_device *pdev)
-{
-       struct dw_pcie *pci = imx6_pcie->pci;
-       struct pcie_port *pp = &pci->pp;
-       struct device *dev = &pdev->dev;
-       int ret;
-
-       pp->ops = &imx6_pcie_host_ops;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static const struct dw_pcie_ops dw_pcie_ops = {
        .start_link = imx6_pcie_start_link,
 };
@@ -1005,6 +986,7 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 
        pci->dev = dev;
        pci->ops = &dw_pcie_ops;
+       pci->pp.ops = &imx6_pcie_host_ops;
 
        imx6_pcie->pci = pci;
        imx6_pcie->drvdata = of_device_get_match_data(dev);
@@ -1154,7 +1136,7 @@ static int imx6_pcie_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = imx6_add_pcie_port(imx6_pcie, pdev);
+       ret = dw_pcie_host_init(&pci->pp);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 5a4bcc2..7197561 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -844,23 +844,6 @@ static irqreturn_t ks_pcie_err_irq_handler(int irq, void *priv)
        return ks_pcie_handle_error_irq(ks_pcie);
 }
 
-static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie,
-                                       struct platform_device *pdev)
-{
-       struct dw_pcie *pci = ks_pcie->pci;
-       struct pcie_port *pp = &pci->pp;
-       struct device *dev = &pdev->dev;
-       int ret;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static void ks_pcie_am654_write_dbi2(struct dw_pcie *pci, void __iomem *base,
                                     u32 reg, size_t size, u32 val)
 {
@@ -1255,7 +1238,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
                }
 
                pci->pp.ops = host_ops;
-               ret = ks_pcie_add_pcie_port(ks_pcie, pdev);
+               ret = dw_pcie_host_init(&pci->pp);
                if (ret < 0)
                        goto err_get_sync;
                break;

diff --git a/drivers/pci/controller/dwc/pci-layerscape.c b/drivers/pci/controller/dwc/pci-layerscape.c
index 400ebbe..44ad34c 100644 (file)
--- a/drivers/pci/controller/dwc/pci-layerscape.c
+++ b/drivers/pci/controller/dwc/pci-layerscape.c
@@ -232,31 +232,12 @@ static const struct of_device_id ls_pcie_of_match[] = {
        { },
 };
 
-static int __init ls_add_pcie_port(struct ls_pcie *pcie)
-{
-       struct dw_pcie *pci = pcie->pci;
-       struct pcie_port *pp = &pci->pp;
-       struct device *dev = pci->dev;
-       int ret;
-
-       pp->ops = pcie->drvdata->ops;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static int __init ls_pcie_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct dw_pcie *pci;
        struct ls_pcie *pcie;
        struct resource *dbi_base;
-       int ret;
 
        pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
        if (!pcie)
@@ -270,6 +251,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
 
        pci->dev = dev;
        pci->ops = pcie->drvdata->dw_pcie_ops;
+       pci->pp.ops = pcie->drvdata->ops;
 
        pcie->pci = pci;
 
@@ -285,11 +267,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, pcie);
 
-       ret = ls_add_pcie_port(pcie);
-       if (ret < 0)
-               return ret;
-
-       return 0;
+       return dw_pcie_host_init(&pci->pp);
 }
 
 static struct platform_driver ls_pcie_driver = {

diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
index 04589f0..686ded0 100644 (file)
--- a/drivers/pci/controller/dwc/pci-meson.c
+++ b/drivers/pci/controller/dwc/pci-meson.c
@@ -387,25 +387,6 @@ static const struct dw_pcie_host_ops meson_pcie_host_ops = {
        .host_init = meson_pcie_host_init,
 };
 
-static int meson_add_pcie_port(struct meson_pcie *mp,
-                              struct platform_device *pdev)
-{
-       struct dw_pcie *pci = &mp->pci;
-       struct pcie_port *pp = &pci->pp;
-       struct device *dev = &pdev->dev;
-       int ret;
-
-       pp->ops = &meson_pcie_host_ops;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static const struct dw_pcie_ops dw_pcie_ops = {
        .link_up = meson_pcie_link_up,
        .start_link = meson_pcie_start_link,
@@ -425,6 +406,7 @@ static int meson_pcie_probe(struct platform_device *pdev)
        pci = &mp->pci;
        pci->dev = dev;
        pci->ops = &dw_pcie_ops;
+       pci->pp.ops = &meson_pcie_host_ops;
        pci->num_lanes = 1;
 
        mp->phy = devm_phy_get(dev, "pcie");
@@ -471,7 +453,7 @@ static int meson_pcie_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, mp);
 
-       ret = meson_add_pcie_port(mp, pdev);
+       ret = dw_pcie_host_init(&pci->pp);
        if (ret < 0) {
                dev_err(dev, "Add PCIe port failed, %d\n", ret);
                goto err_phy;

diff --git a/drivers/pci/controller/dwc/pcie-al.c b/drivers/pci/controller/dwc/pcie-al.c
index d068669..7ac8a37 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-al.c
+++ b/drivers/pci/controller/dwc/pcie-al.c
@@ -322,23 +322,6 @@ static const struct dw_pcie_host_ops al_pcie_host_ops = {
        .host_init = al_pcie_host_init,
 };
 
-static int al_add_pcie_port(struct pcie_port *pp,
-                           struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       int ret;
-
-       pp->ops = &al_pcie_host_ops;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static const struct dw_pcie_ops dw_pcie_ops = {
 };
 
@@ -360,6 +343,7 @@ static int al_pcie_probe(struct platform_device *pdev)
 
        pci->dev = dev;
        pci->ops = &dw_pcie_ops;
+       pci->pp.ops = &al_pcie_host_ops;
 
        al_pcie->pci = pci;
        al_pcie->dev = dev;
@@ -384,7 +368,7 @@ static int al_pcie_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, al_pcie);
 
-       return al_add_pcie_port(&pci->pp, pdev);
+       return dw_pcie_host_init(&pci->pp);
 }
 
 static const struct of_device_id al_pcie_of_match[] = {

diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
index fcba991..597c282 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-artpec6.c
+++ b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -336,25 +336,6 @@ static const struct dw_pcie_host_ops artpec6_pcie_host_ops = {
        .host_init = artpec6_pcie_host_init,
 };
 
-static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
-                                struct platform_device *pdev)
-{
-       struct dw_pcie *pci = artpec6_pcie->pci;
-       struct pcie_port *pp = &pci->pp;
-       struct device *dev = pci->dev;
-       int ret;
-
-       pp->ops = &artpec6_pcie_host_ops;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "failed to initialize host\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)
 {
        struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
@@ -445,7 +426,9 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
                if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST))
                        return -ENODEV;
 
-               ret = artpec6_add_pcie_port(artpec6_pcie, pdev);
+               pci->pp.ops = &artpec6_pcie_host_ops;
+
+               ret = dw_pcie_host_init(&pci->pp);
                if (ret < 0)
                        return ret;
                break;

diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c
index ac4bbda..026fd1e 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-kirin.c
+++ b/drivers/pci/controller/dwc/pcie-kirin.c
@@ -419,14 +419,6 @@ static const struct dw_pcie_host_ops kirin_pcie_host_ops = {
        .host_init = kirin_pcie_host_init,
 };
 
-static int kirin_add_pcie_port(struct dw_pcie *pci,
-                              struct platform_device *pdev)
-{
-       pci->pp.ops = &kirin_pcie_host_ops;
-
-       return dw_pcie_host_init(&pci->pp);
-}
-
 static int kirin_pcie_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -449,6 +441,7 @@ static int kirin_pcie_probe(struct platform_device *pdev)
 
        pci->dev = dev;
        pci->ops = &kirin_dw_pcie_ops;
+       pci->pp.ops = &kirin_pcie_host_ops;
        kirin_pcie->pci = pci;
 
        ret = kirin_pcie_get_clk(kirin_pcie, pdev);
@@ -474,7 +467,7 @@ static int kirin_pcie_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, kirin_pcie);
 
-       return kirin_add_pcie_port(pci, pdev);
+       return dw_pcie_host_init(&pci->pp);
 }
 
 static const struct of_device_id kirin_pcie_match[] = {

diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c
index 2457e9d..7e8bad3 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -321,25 +321,6 @@ static const struct dw_pcie_host_ops uniphier_pcie_host_ops = {
        .host_init = uniphier_pcie_host_init,
 };
 
-static int uniphier_add_pcie_port(struct uniphier_pcie_priv *priv,
-                                 struct platform_device *pdev)
-{
-       struct dw_pcie *pci = &priv->pci;
-       struct pcie_port *pp = &pci->pp;
-       struct device *dev = &pdev->dev;
-       int ret;
-
-       pp->ops = &uniphier_pcie_host_ops;
-
-       ret = dw_pcie_host_init(pp);
-       if (ret) {
-               dev_err(dev, "Failed to initialize host (%d)\n", ret);
-               return ret;
-       }
-
-       return 0;
-}
-
 static int uniphier_pcie_host_enable(struct uniphier_pcie_priv *priv)
 {
        int ret;
@@ -415,7 +396,9 @@ static int uniphier_pcie_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       return uniphier_add_pcie_port(priv, pdev);
+       priv->pci.pp.ops = &uniphier_pcie_host_ops;
+
+       return dw_pcie_host_init(&priv->pci.pp);
 }
 
 static const struct of_device_id uniphier_pcie_match[] = {