remoteproc/davinci: simplify use of devm_ioremap_resource
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 14 Aug 2013 09:11:28 +0000 (11:11 +0200)
committerOhad Ben-Cohen <ohad@wizery.com>
Mon, 24 Feb 2014 09:10:24 +0000 (11:10 +0200)
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>
[simplify patch title]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
drivers/remoteproc/da8xx_remoteproc.c

index b91cd30..3841b98 100644 (file)
@@ -201,23 +201,11 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
        }
 
        bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!bootreg_res) {
-               dev_err(dev,
-                       "platform_get_resource(IORESOURCE_MEM, 0): NULL\n");
-               return -EADDRNOTAVAIL;
-       }
-
-       chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (!chipsig_res) {
-               dev_err(dev,
-                       "platform_get_resource(IORESOURCE_MEM, 1): NULL\n");
-               return -EADDRNOTAVAIL;
-       }
-
        bootreg = devm_ioremap_resource(dev, bootreg_res);
        if (IS_ERR(bootreg))
                return PTR_ERR(bootreg);
 
+       chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        chipsig = devm_ioremap_resource(dev, chipsig_res);
        if (IS_ERR(chipsig))
                return PTR_ERR(chipsig);