Commit 086f2d50 authored Aug 14, 2013 by Julia Lawall Committed by Wim Van Sebroeck Sep 10, 2013

watchdog: ts72xx_wdt: 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>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent 9aebc962

drivers/watchdog/ts72xx_wdt.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -403,21 +403,11 @@ static int ts72xx_wdt_probe(struct platform_device *pdev)
		}

		r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!r1) {
		dev_err(&pdev->dev, "failed to get memory resource\n");
		return -ENODEV;
		}

		wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1);
		if (IS_ERR(wdt->control_reg))
		return PTR_ERR(wdt->control_reg);

		r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
		if (!r2) {
		dev_err(&pdev->dev, "failed to get memory resource\n");
		return -ENODEV;
		}

		wdt->feed_reg = devm_ioremap_resource(&pdev->dev, r2);
		if (IS_ERR(wdt->feed_reg))
		return PTR_ERR(wdt->feed_reg);