Commit 60f5b73f authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo 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
parent b9ac0f9d

drivers/pci/controller/dwc/pci-imx6.c

+2 −20
Original line number Diff line number Diff line
@@ -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;

drivers/pci/controller/dwc/pci-keystone.c

+1 −18
Original line number Diff line number Diff line
@@ -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;

drivers/pci/controller/dwc/pci-layerscape.c

+2 −24
Original line number Diff line number Diff line
@@ -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 = {

drivers/pci/controller/dwc/pci-meson.c

+2 −20
Original line number Diff line number Diff line
@@ -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;

drivers/pci/controller/dwc/pcie-al.c

+2 −18
Original line number Diff line number Diff line
@@ -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[] = {