drm: Convert to devm_ioremap_resource()

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: Thierry Reding <thierry.reding@avionic-design.de>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6 files changed, 18 insertions, 29 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 67a83e69544b..411f69b76e84 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -1785,11 +1785,9 @@ static int fimc_probe(struct platform_device *pdev)
 
         /* resource memory */
         ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        ctx->regs = devm_request_and_ioremap(dev, ctx->regs_res);
-        if (!ctx->regs) {
-                dev_err(dev, "failed to map registers.\n");
-                return -ENXIO;
-        }
+        ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);
+        if (IS_ERR(ctx->regs))
+                return PTR_ERR(ctx->regs);
 
         /* resource irq */
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 9537761931ee..36493ce71f9a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -913,11 +913,9 @@ static int fimd_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        ctx->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!ctx->regs) {
-                dev_err(dev, "failed to map registers\n");
-                return -ENXIO;
-        }
+        ctx->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(ctx->regs))
+                return PTR_ERR(ctx->regs);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!res) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 36c3905536a6..7329abda1825 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -1136,10 +1136,9 @@ static int g2d_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        g2d->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!g2d->regs) {
-                dev_err(dev, "failed to remap I/O memory\n");
-                ret = -ENXIO;
+        g2d->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(g2d->regs)) {
+                ret = PTR_ERR(g2d->regs);
                 goto err_put_clk;
         }
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 8140753ec9c8..7841c3b8a20e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -1692,11 +1692,9 @@ static int gsc_probe(struct platform_device *pdev)
 
         /* resource memory */
         ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        ctx->regs = devm_request_and_ioremap(dev, ctx->regs_res);
-        if (!ctx->regs) {
-                dev_err(dev, "failed to map registers.\n");
-                return -ENXIO;
-        }
+        ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);
+        if (IS_ERR(ctx->regs))
+                return PTR_ERR(ctx->regs);
 
         /* resource irq */
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
index e9e83ef688f0..a6da77409944 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -656,11 +656,9 @@ static int rotator_probe(struct platform_device *pdev)
                                 platform_get_device_id(pdev)->driver_data;
 
         rot->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        rot->regs = devm_request_and_ioremap(dev, rot->regs_res);
-        if (!rot->regs) {
-                dev_err(dev, "failed to map register\n");
-                return -ENXIO;
-        }
+        rot->regs = devm_ioremap_resource(dev, rot->regs_res);
+        if (IS_ERR(rot->regs))
+                return PTR_ERR(rot->regs);
 
         rot->irq = platform_get_irq(pdev, 0);
         if (rot->irq < 0) {
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 41ff79d8ac8e..d4c3f3d400f5 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -2526,11 +2526,9 @@ static int hdmi_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        hdata->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!hdata->regs) {
-                DRM_ERROR("failed to map registers\n");
-                return -ENXIO;
-        }
+        hdata->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hdata->regs))
+                return PTR_ERR(hdata->regs);
 
         ret = devm_gpio_request(&pdev->dev, hdata->hpd_gpio, "HPD");
         if (ret) {