| Message ID | 1362384921-7344-4-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 04, 2013 at 01:45:21PM +0530, Sachin Kamat wrote: > 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> > --- > drivers/media/platform/soc_camera/sh_mobile_csi2.c | 9 ++++----- > 1 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c > index 42c559e..09cb4fc 100644 > --- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c > +++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c > @@ -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); Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c index 42c559e..09cb4fc 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c +++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c @@ -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);
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> --- drivers/media/platform/soc_camera/sh_mobile_csi2.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)