]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
video: mxsfb: simplify use of devm_ioremap_resource
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 14 Aug 2013 09:11:06 +0000 (11:11 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 30 Aug 2013 07:50:20 +0000 (10:50 +0300)
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/mxsfb.c

index 5861ba2c2a20c04815533a5939064b7e91c32f2c..91269f6eab8d9320c9be28fa777199b3eeb9cf63 100644 (file)
@@ -881,12 +881,6 @@ static int mxsfb_probe(struct platform_device *pdev)
        if (of_id)
                pdev->id_entry = of_id->data;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "Cannot get memory IO resource\n");
-               return -ENODEV;
-       }
-
        fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev);
        if (!fb_info) {
                dev_err(&pdev->dev, "Failed to allocate fbdev\n");
@@ -895,6 +889,7 @@ static int mxsfb_probe(struct platform_device *pdev)
 
        host = to_imxfb_host(fb_info);
 
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        host->base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(host->base)) {
                ret = PTR_ERR(host->base);