Commit 936fa5cd authored by Dejin Zheng's avatar Dejin Zheng Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Convert to devm_platform_ioremap_resource_byname() 

Use devm_platform_ioremap_resource_byname() to simplify the code
since it contains platform_get_resource_byname() and
devm_ioremap_resource() respectively.

Link: https://lore.kernel.org/r/20200708164013.5076-1-zhengdejin5@gmail.com


Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
parent 824001cb

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

+4 −7
Original line number Diff line number Diff line
@@ -593,13 +593,12 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, 
	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics");

	pci->dbi_base = devm_ioremap_resource(dev, res);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "ep_dbics");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics2");

	pci->dbi_base2 = devm_ioremap_resource(dev, res);

	pci->dbi_base2 =

		devm_platform_ioremap_resource_byname(pdev, "ep_dbics2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);
@@ -626,7 +625,6 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
	struct dw_pcie *pci = dra7xx->pci;

	struct pcie_port *pp = &pci->pp;

	struct device *dev = pci->dev;

	struct resource *res;



	pp->irq = platform_get_irq(pdev, 1);

	if (pp->irq < 0) {
@@ -638,8 +636,7 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
	if (ret < 0)

		return ret;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics");

	pci->dbi_base = devm_ioremap_resource(dev, res);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "rc_dbics");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);

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

+1 −2
Original line number Diff line number Diff line
@@ -1323,8 +1323,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	}



	if (pci->version >= 0x480A) {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");

		atu_base = devm_ioremap_resource(dev, res);

		atu_base = devm_platform_ioremap_resource_byname(pdev, "atu");

		if (IS_ERR(atu_base)) {

			ret = PTR_ERR(atu_base);

			goto err_get_sync;

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

+4 −8
Original line number Diff line number Diff line
@@ -455,8 +455,7 @@ static int artpec6_add_pcie_ep(struct artpec6_pcie *artpec6_pcie, 
	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");

	pci->dbi_base2 = devm_ioremap_resource(dev, res);

	pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);
@@ -481,8 +480,6 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct dw_pcie *pci;

	struct artpec6_pcie *artpec6_pcie;

	struct resource *dbi_base;

	struct resource *phy_base;

	int ret;

	const struct of_device_id *match;

	const struct artpec_pcie_of_data *data;
@@ -512,13 +509,12 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	artpec6_pcie->variant = variant;

	artpec6_pcie->mode = mode;



	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");

	pci->dbi_base = devm_ioremap_resource(dev, dbi_base);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	phy_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");

	artpec6_pcie->phy_base = devm_ioremap_resource(dev, phy_base);

	artpec6_pcie->phy_base =

		devm_platform_ioremap_resource_byname(pdev, "phy");

	if (IS_ERR(artpec6_pcie->phy_base))

		return PTR_ERR(artpec6_pcie->phy_base);

drivers/pci/controller/dwc/pcie-designware-plat.c

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ static int dw_plat_add_pcie_ep(struct dw_plat_pcie *dw_plat_pcie, 
	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");

	pci->dbi_base2 = devm_ioremap_resource(dev, res);

	pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);

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

+2 −5
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ static int histb_pcie_probe(struct platform_device *pdev) 
	struct histb_pcie *hipcie;

	struct dw_pcie *pci;

	struct pcie_port *pp;

	struct resource *res;

	struct device_node *np = pdev->dev.of_node;

	struct device *dev = &pdev->dev;

	enum of_gpio_flags of_flags;
@@ -324,15 +323,13 @@ static int histb_pcie_probe(struct platform_device *pdev) 
	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "control");

	hipcie->ctrl = devm_ioremap_resource(dev, res);

	hipcie->ctrl = devm_platform_ioremap_resource_byname(pdev, "control");

	if (IS_ERR(hipcie->ctrl)) {

		dev_err(dev, "cannot get control reg base\n");

		return PTR_ERR(hipcie->ctrl);

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc-dbi");

	pci->dbi_base = devm_ioremap_resource(dev, res);

	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "rc-dbi");

	if (IS_ERR(pci->dbi_base)) {

		dev_err(dev, "cannot get rc-dbi base\n");

		return PTR_ERR(pci->dbi_base);