Commit 690ebabb authored Aug 14, 2013 by Julia Lawall Committed by Linus Walleij Aug 15, 2013

pinctrl: nomadik: 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: Linus Walleij <linus.walleij@linaro.org>

parent 0d74d4a1

drivers/pinctrl/pinctrl-nomadik.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1055,10 +1055,6 @@ static int nmk_gpio_probe(struct platform_device *dev)
		pdata->num_gpio = NMK_GPIO_PER_CHIP;
		}

		res = platform_get_resource(dev, IORESOURCE_MEM, 0);
		if (!res)
		return -ENOENT;

		irq = platform_get_irq(dev, 0);
		if (irq < 0)
		return irq;
		@@ -1067,6 +1063,7 @@ static int nmk_gpio_probe(struct platform_device *dev)
		if (secondary_irq >= 0 && !pdata->get_secondary_status)
		return -EINVAL;

		res = platform_get_resource(dev, IORESOURCE_MEM, 0);
		base = devm_ioremap_resource(&dev->dev, res);
		if (IS_ERR(base))
		return PTR_ERR(base);