Hi Silviu-Mihai On Mon, 11 Mar 2013, Silviu-Mihai Popescu wrote: > Convert all uses of devm_request_and_ioremap() to the newly introduced > devm_ioremap_resource() 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: Silviu-Mihai Popescu <silviupopescu1990@xxxxxxxxx> Is there anything in this patch, that this patch series http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/61337 is missing? Thanks Guennadi > --- > drivers/media/platform/soc_camera/pxa_camera.c | 6 +++--- > .../platform/soc_camera/sh_mobile_ceu_camera.c | 8 +++----- > drivers/media/platform/soc_camera/sh_mobile_csi2.c | 8 +++----- > 3 files changed, 9 insertions(+), 13 deletions(-) > > diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c > index 395e2e0..e94ed6c 100644 > --- a/drivers/media/platform/soc_camera/pxa_camera.c > +++ b/drivers/media/platform/soc_camera/pxa_camera.c > @@ -1710,9 +1710,9 @@ static int pxa_camera_probe(struct platform_device *pdev) > /* > * Request the regions. > */ > - base = devm_request_and_ioremap(&pdev->dev, res); > - if (!base) > - return -ENOMEM; > + base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > pcdev->irq = irq; > pcdev->base = base; > > diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c > index bb08a46..8cdee71 100644 > --- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c > +++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c > @@ -2110,11 +2110,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; > diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c > index 42c559e..3ec7735 100644 > --- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c > +++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c > @@ -324,11 +324,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); > -- > 1.7.9.5 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html