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

PCI: controller: Convert to devm_platform_ioremap_resource_byname() 

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

Link: https://lore.kernel.org/r/20200602171601.17630-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 avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
parent 78aada4b

drivers/pci/controller/cadence/pcie-cadence-ep.c

+1 −2
Original line number Diff line number Diff line
@@ -408,8 +408,7 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) 


	pcie->is_rc = false;



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

	pcie->reg_base = devm_ioremap_resource(dev, res);

	pcie->reg_base = devm_platform_ioremap_resource_byname(pdev, "reg");

	if (IS_ERR(pcie->reg_base)) {

		dev_err(dev, "missing \"reg\"\n");

		return PTR_ERR(pcie->reg_base);

drivers/pci/controller/cadence/pcie-cadence-host.c

+1 −2
Original line number Diff line number Diff line
@@ -217,8 +217,7 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) 
	rc->device_id = 0xffff;

	of_property_read_u32(np, "device-id", &rc->device_id);



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

	pcie->reg_base = devm_ioremap_resource(dev, res);

	pcie->reg_base = devm_platform_ioremap_resource_byname(pdev, "reg");

	if (IS_ERR(pcie->reg_base)) {

		dev_err(dev, "missing \"reg\"\n");

		return PTR_ERR(pcie->reg_base);

drivers/pci/controller/pci-tegra.c

+3 −5
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) 
{

	struct device *dev = pcie->dev;

	struct platform_device *pdev = to_platform_device(dev);

	struct resource *pads, *afi, *res;

	struct resource *res;

	const struct tegra_pcie_soc *soc = pcie->soc;

	int err;
@@ -1486,15 +1486,13 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) 
		}

	}



	pads = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pads");

	pcie->pads = devm_ioremap_resource(dev, pads);

	pcie->pads = devm_platform_ioremap_resource_byname(pdev, "pads");

	if (IS_ERR(pcie->pads)) {

		err = PTR_ERR(pcie->pads);

		goto phys_put;

	}



	afi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "afi");

	pcie->afi = devm_ioremap_resource(dev, afi);

	pcie->afi = devm_platform_ioremap_resource_byname(pdev, "afi");

	if (IS_ERR(pcie->afi)) {

		err = PTR_ERR(pcie->afi);

		goto phys_put;

drivers/pci/controller/pci-xgene.c

+1 −2
Original line number Diff line number Diff line
@@ -355,8 +355,7 @@ static int xgene_pcie_map_reg(struct xgene_pcie_port *port, 
	if (IS_ERR(port->csr_base))

		return PTR_ERR(port->csr_base);



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

	port->cfg_base = devm_ioremap_resource(dev, res);

	port->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");

	if (IS_ERR(port->cfg_base))

		return PTR_ERR(port->cfg_base);

	port->cfg_addr = res->start;

drivers/pci/controller/pcie-altera-msi.c

+1 −2
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ static int altera_msi_probe(struct platform_device *pdev) 
	mutex_init(&msi->lock);

	msi->pdev = pdev;



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

	msi->csr_base = devm_ioremap_resource(&pdev->dev, res);

	msi->csr_base = devm_platform_ioremap_resource_byname(pdev, "csr");

	if (IS_ERR(msi->csr_base)) {

		dev_err(&pdev->dev, "failed to map csr memory\n");

		return PTR_ERR(msi->csr_base);