]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] soc_camera/sh_mobile_ceu_camera: Convert to devm_ioremap_resource()
authorSachin Kamat <sachin.kamat@linaro.org>
Mon, 4 Mar 2013 08:15:20 +0000 (05:15 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Mar 2013 17:33:08 +0000 (14:33 -0300)
Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.
devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c

index 973e72b24fa85f91ef86747826e76f765b340672..d7294efc3199004da13021a4e56e93009c0e7db2 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/completion.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
@@ -2111,11 +2112,9 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
        pcdev->max_width = pcdev->pdata->max_width ? : 2560;
        pcdev->max_height = pcdev->pdata->max_height ? : 1920;
 
-       base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!base) {
-               dev_err(&pdev->dev, "Unable to ioremap CEU registers.\n");
-               return -ENXIO;
-       }
+       base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
        pcdev->irq = irq;
        pcdev->base = base;