Commit 64efc5a0 authored Aug 14, 2013 by Julia Lawall Committed by Mark Brown Aug 14, 2013

ASoC: samsung-ac97: simplify use of devm_ioremap_resource

Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.

Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@

- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
  ... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
  ... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
  e = devm_ioremap_resource(e1, res);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent c7f7e607

sound/soc/samsung/ac97.c

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -404,18 +404,13 @@ static int s3c_ac97_probe(struct platform_device *pdev)
	return -ENXIO;		return -ENXIO;
	}		}

	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
	if (!mem_res) {
	dev_err(&pdev->dev, "Unable to get register resource\n");
	return -ENXIO;
	}

	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);		irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
	if (!irq_res) {		if (!irq_res) {
	dev_err(&pdev->dev, "AC97 IRQ not provided!\n");		dev_err(&pdev->dev, "AC97 IRQ not provided!\n");
	return -ENXIO;		return -ENXIO;
	}		}

			mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
	s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res);		s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res);
	if (IS_ERR(s3c_ac97.regs))		if (IS_ERR(s3c_ac97.regs))
	return PTR_ERR(s3c_ac97.regs);		return PTR_ERR(s3c_ac97.regs);