diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:23 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-09-10 15:15:32 -0400 |
commit | 086f2d500c693e2d175fe06c9dbfde1c69a26644 (patch) | |
tree | d3b8b3e080716da3b874b3e8717248be1c83bac6 | |
parent | 9aebc962767194c330868f53e293d4179919912c (diff) |
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>
-rw-r--r-- | drivers/watchdog/ts72xx_wdt.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index 4da59b4d73f0..42913f131dc2 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c | |||
@@ -403,21 +403,11 @@ static int ts72xx_wdt_probe(struct platform_device *pdev) | |||
403 | } | 403 | } |
404 | 404 | ||
405 | r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 405 | r1 = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
406 | if (!r1) { | ||
407 | dev_err(&pdev->dev, "failed to get memory resource\n"); | ||
408 | return -ENODEV; | ||
409 | } | ||
410 | |||
411 | wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1); | 406 | wdt->control_reg = devm_ioremap_resource(&pdev->dev, r1); |
412 | if (IS_ERR(wdt->control_reg)) | 407 | if (IS_ERR(wdt->control_reg)) |
413 | return PTR_ERR(wdt->control_reg); | 408 | return PTR_ERR(wdt->control_reg); |
414 | 409 | ||
415 | r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 410 | r2 = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
416 | if (!r2) { | ||
417 | dev_err(&pdev->dev, "failed to get memory resource\n"); | ||
418 | return -ENODEV; | ||
419 | } | ||
420 | |||
421 | wdt->feed_reg = devm_ioremap_resource(&pdev->dev, r2); | 411 | wdt->feed_reg = devm_ioremap_resource(&pdev->dev, r2); |
422 | if (IS_ERR(wdt->feed_reg)) | 412 | if (IS_ERR(wdt->feed_reg)) |
423 | return PTR_ERR(wdt->feed_reg); | 413 | return PTR_ERR(wdt->feed_reg); |