]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] marvell-ccic/mmp-driver.c: simplify use of devm_ioremap_resource
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 14 Aug 2013 08:11:15 +0000 (05:11 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 22 Aug 2013 15:45:23 +0000 (12:45 -0300)
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>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/marvell-ccic/mmp-driver.c

index f06daa4f2502000bfd6e2038d10f806640b67da7..b5a19af5c587103c1c134b8b5fd0e19a13dc8853 100644 (file)
@@ -396,10 +396,6 @@ static int mmpcam_probe(struct platform_device *pdev)
         * Get our I/O memory.
         */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               dev_err(&pdev->dev, "no iomem resource!\n");
-               return -ENODEV;
-       }
        mcam->regs = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(mcam->regs))
                return PTR_ERR(mcam->regs);
@@ -409,10 +405,6 @@ static int mmpcam_probe(struct platform_device *pdev)
         * should really be managed outside of this driver?
         */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (res == NULL) {
-               dev_err(&pdev->dev, "no power resource!\n");
-               return -ENODEV;
-       }
        cam->power_regs = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(cam->power_regs))
                return PTR_ERR(cam->power_regs);