MIPS: ath79: simplify platform_get_resource_byname/devm_ioremap_resource (c6e7274e) · Commits · 戴 / test

Remove unneeded error handling on the result of a call to platform_get_resource_byname when the value is passed to devm_ioremap_resource. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/ ) // <smpl> @@ expression pdev,res,e,e1; expression ret != 0; identifier l; @@ res = platform_get_resource_byname(...); - if (res == NULL) { ... \(goto l;\|return ret;\) } e = devm_ioremap_resource(e1, res); // </smpl> Signed-off-by:

Julia Lawall <Julia.Lawall@lip6.fr> Acked-by:

Gabor Juhos <juhosg@openwrt.org> Cc: kernel-janitors@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/5725/ Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/mips/pci/pci-ar71xx.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -363,9 +363,6 @@ static int ar71xx_pci_probe(struct platform_device *pdev)
		spin_lock_init(&apc->lock);

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
		if (!res)
		return -EINVAL;

		apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(apc->cfg_base))
		return PTR_ERR(apc->cfg_base);

arch/mips/pci/pci-ar724x.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -362,25 +362,16 @@ static int ar724x_pci_probe(struct platform_device *pdev)
		return -ENOMEM;

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl_base");
		if (!res)
		return -EINVAL;

		apc->ctrl_base = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(apc->ctrl_base))
		return PTR_ERR(apc->ctrl_base);

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
		if (!res)
		return -EINVAL;

		apc->devcfg_base = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(apc->devcfg_base))
		return PTR_ERR(apc->devcfg_base);

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crp_base");
		if (!res)
		return -EINVAL;

		apc->crp_base = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(apc->crp_base))
		return PTR_ERR(apc->crp_base);

Admin message