[media] soc_camera/sh_mobile_csi2: Convert to devm_ioremap_resource()
authorSachin Kamat <sachin.kamat@linaro.org>
Mon, 4 Mar 2013 08:15:21 +0000 (05:15 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Mar 2013 17:33:31 +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_csi2.c

index 42c559eb493794de2e4f6885e494ae6f812c02f0..09cb4fc88f3437ee3bb48c35f834440bb66b656e 100644 (file)
@@ -9,6 +9,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
@@ -324,11 +325,9 @@ static int sh_csi2_probe(struct platform_device *pdev)
 
        priv->irq = irq;
 
-       priv->base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!priv->base) {
-               dev_err(&pdev->dev, "Unable to ioremap CSI2 registers.\n");
-               return -ENXIO;
-       }
+       priv->base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(priv->base))
+               return PTR_ERR(priv->base);
 
        priv->pdev = pdev;
        platform_set_drvdata(pdev, priv);