Commit 9aebc962 authored Aug 14, 2013 by Julia Lawall Committed by Wim Van Sebroeck Sep 10, 2013

watchdog: nuc900_wdt.c: 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.

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>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Wan Zongshun <mcuos.com@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent d00680ed

drivers/watchdog/nuc900_wdt.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -256,11 +256,6 @@ static int nuc900wdt_probe(struct platform_device *pdev)
		spin_lock_init(&nuc900_wdt->wdt_lock);

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (res == NULL) {
		dev_err(&pdev->dev, "no memory resource specified\n");
		return -ENOENT;
		}

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