Commit b0a1c290 authored by Zhang Qilong's avatar Zhang Qilong Committed by Thomas Bogendoerfer
Browse files

MIPS: pci: use devm_platform_ioremap_resource_byname 



Use the devm_platform_ioremap_resource_byname() helper instead of
calling platform_get_resource_byname() and devm_ioremap_resource()
separately.

Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 38a6445c

arch/mips/pci/pci-ar2315.c

+2 −3
Original line number Diff line number Diff line
@@ -423,9 +423,8 @@ static int ar2315_pci_probe(struct platform_device *pdev) 
		return -EINVAL;

	apc->irq = irq;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

	apc->mmr_mem = devm_platform_ioremap_resource_byname(pdev,

							     "ar2315-pci-ctrl");

	apc->mmr_mem = devm_ioremap_resource(dev, res);

	if (IS_ERR(apc->mmr_mem))

		return PTR_ERR(apc->mmr_mem);

arch/mips/pci/pci-ar71xx.c

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ static int ar71xx_pci_probe(struct platform_device *pdev) 
	if (!apc)

		return -ENOMEM;



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

	apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);

	apc->cfg_base = devm_platform_ioremap_resource_byname(pdev,

							      "cfg_base");

	if (IS_ERR(apc->cfg_base))

		return PTR_ERR(apc->cfg_base);

arch/mips/pci/pci-ar724x.c

+3 −6
Original line number Diff line number Diff line
@@ -372,18 +372,15 @@ static int ar724x_pci_probe(struct platform_device *pdev) 
	if (!apc)

		return -ENOMEM;



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

	apc->ctrl_base = devm_ioremap_resource(&pdev->dev, res);

	apc->ctrl_base = devm_platform_ioremap_resource_byname(pdev, "ctrl_base");

	if (IS_ERR(apc->ctrl_base))

		return PTR_ERR(apc->ctrl_base);



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

	apc->devcfg_base = devm_ioremap_resource(&pdev->dev, res);

	apc->devcfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg_base");

	if (IS_ERR(apc->devcfg_base))

		return PTR_ERR(apc->devcfg_base);



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

	apc->crp_base = devm_ioremap_resource(&pdev->dev, res);

	apc->crp_base = devm_platform_ioremap_resource_byname(pdev, "crp_base");

	if (IS_ERR(apc->crp_base))

		return PTR_ERR(apc->crp_base);