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>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 67a83e69544bb4e285088be9227c3ed2176ebcb6..411f69b76e84da9883a191145ea831c8e946dcaf 100644 (file)
--- 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 9537761931ee297fb33c8cf8888a2842b1e4fc1a..36493ce71f9a8c217ebe8af960598b299f1a95bb 100644 (file)
--- 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 36c3905536a65e824766ec61a385bb44a5f6c3f9..7329abda1825098b3dfe812a45bfe8595e9f6eb7 100644 (file)
--- 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 8140753ec9c824202173e631bfc1f4ba711c9ef7..7841c3b8a20e022e94a0983c2ba09b232ab66fc4 100644 (file)
--- 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 e9e83ef688f0c3a4ccf0253154975eebddb1d378..a6da77409944a9553db83c966530e84aa7bb77bb 100644 (file)
--- 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 41ff79d8ac8ec27db3f4b5cd3edadb0d86dde241..d4c3f3d400f5a4994f2bb50f67e5f0adf9246c00 100644 (file)
--- 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) {

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 656b2e3334a621109426806043032ae3422d9631..d365c6dff0fb85ef9176d553b5b333f8e528d09a 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -764,11 +764,9 @@ static int tegra_dc_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       dc->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!dc->regs) {
-               dev_err(&pdev->dev, "failed to remap registers\n");
-               return -ENXIO;
-       }
+       dc->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(dc->regs))
+               return PTR_ERR(dc->regs);
 
        dc->irq = platform_get_irq(pdev, 0);
        if (dc->irq < 0) {

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index e060c7e6434dba886e8698782cbfb0c3ce4b9cf7..266af7879240f6d571a76df7584d308ad82ad1e5 100644 (file)
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1259,9 +1259,9 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
        if (!regs)
                return -ENXIO;
 
-       hdmi->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!hdmi->regs)
-               return -EADDRNOTAVAIL;
+       hdmi->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(hdmi->regs))
+               return PTR_ERR(hdmi->regs);
 
        err = platform_get_irq(pdev, 0);
        if (err < 0)

diff --git a/drivers/gpu/drm/tegra/host1x.c b/drivers/gpu/drm/tegra/host1x.c
index 5d17b113a6fc7d2618e409c735c4273d3ade6c8a..92e25a7e00eabc28bd37572a8e2d2772b883e24f 100644 (file)
--- a/drivers/gpu/drm/tegra/host1x.c
+++ b/drivers/gpu/drm/tegra/host1x.c
@@ -139,9 +139,9 @@ static int tegra_host1x_probe(struct platform_device *pdev)
 
        host1x->irq = err;
 
-       host1x->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!host1x->regs) {
-               err = -EADDRNOTAVAIL;
+       host1x->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(host1x->regs)) {
+               err = PTR_ERR(host1x->regs);
                goto err;
        }