media: 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: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 2b1b9f30e1f940032e20505142cd7291f3587511..c1a07133cc564108841a4fbb65cfeb76dd8920f1 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1098,11 +1098,9 @@ static int gsc_probe(struct platform_device *pdev)
        mutex_init(&gsc->lock);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       gsc->regs = devm_request_and_ioremap(dev, res);
-       if (!gsc->regs) {
-               dev_err(dev, "failed to map registers\n");
-               return -ENOENT;
-       }
+       gsc->regs = devm_ioremap_resource(dev, res);
+       if (IS_ERR(gsc->regs))
+               return PTR_ERR(gsc->regs);
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (!res) {

diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 6b155d7be8e0d3c23e419fc3d6d2cdc6601fcd0e..4b9e0a28616a202793741712cb8fadd230c05486 100644 (file)
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -941,9 +941,9 @@ static int emmaprp_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, pcdev);
 
-       pcdev->base_emma = devm_request_and_ioremap(&pdev->dev, res_emma);
-       if (!pcdev->base_emma) {
-               ret = -ENXIO;
+       pcdev->base_emma = devm_ioremap_resource(&pdev->dev, res_emma);
+       if (IS_ERR(pcdev->base_emma)) {
+               ret = PTR_ERR(pcdev->base_emma);
                goto rel_vdev;
        }
 

diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index e2716c35f8f189ebbfbbb44de6386ffb82fc4133..09a8c9cac5c95227440aa56c165ace67598c5b72 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -433,11 +433,9 @@ static int s3c_camif_probe(struct platform_device *pdev)
 
        mres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       camif->io_base = devm_request_and_ioremap(dev, mres);
-       if (!camif->io_base) {
-               dev_err(dev, "failed to obtain I/O memory\n");
-               return -ENOENT;
-       }
+       camif->io_base = devm_ioremap_resource(dev, mres);
+       if (IS_ERR(camif->io_base))
+               return PTR_ERR(camif->io_base);
 
        ret = camif_request_irqs(pdev, camif);
        if (ret < 0)

diff --git a/drivers/media/platform/s5p-fimc/fimc-core.c b/drivers/media/platform/s5p-fimc/fimc-core.c
index 545b46ae12a1ae90c63c93c4e18f76ddc81ca7af..acc0f84ffa5630a6ff82c11948071d7b438674d8 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-core.c
+++ b/drivers/media/platform/s5p-fimc/fimc-core.c
@@ -909,11 +909,9 @@ static int fimc_probe(struct platform_device *pdev)
        mutex_init(&fimc->lock);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       fimc->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (fimc->regs == NULL) {
-               dev_err(&pdev->dev, "Failed to obtain io memory\n");
-               return -ENOENT;
-       }
+       fimc->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(fimc->regs))
+               return PTR_ERR(fimc->regs);
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (res == NULL) {

diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c
index ed67220d0a64734bd56498c63555db5c732d4f5a..67db9f8102e432ea3f0a2d5e0b9cc42d7d50c538 100644 (file)
--- a/drivers/media/platform/s5p-fimc/fimc-lite.c
+++ b/drivers/media/platform/s5p-fimc/fimc-lite.c
@@ -1426,11 +1426,9 @@ static int fimc_lite_probe(struct platform_device *pdev)
        mutex_init(&fimc->lock);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       fimc->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (fimc->regs == NULL) {
-               dev_err(&pdev->dev, "Failed to obtain io memory\n");
-               return -ENOENT;
-       }
+       fimc->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(fimc->regs))
+               return PTR_ERR(fimc->regs);
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (res == NULL) {

diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.c b/drivers/media/platform/s5p-fimc/mipi-csis.c
index ec3fa7d75306675d4fde53ecb2c2f52c0fc6cbe8..7abae012f55eecdf98526777c13c6ad65c1a8a96 100644 (file)
--- a/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -686,11 +686,9 @@ static int s5pcsis_probe(struct platform_device *pdev)
        }
 
        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       state->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
-       if (state->regs == NULL) {
-               dev_err(&pdev->dev, "Failed to request and remap io memory\n");
-               return -ENXIO;
-       }
+       state->regs = devm_ioremap_resource(&pdev->dev, mem_res);
+       if (IS_ERR(state->regs))
+               return PTR_ERR(state->regs);
 
        state->irq = platform_get_irq(pdev, 0);
        if (state->irq < 0) {

diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index 1bfbc325836b7077b9609da1af8f9958b92d4608..6ed259fb10469a74588faec6c38f20cd6f120a8a 100644 (file)
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -708,11 +708,9 @@ static int g2d_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       dev->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (dev->regs == NULL) {
-                       dev_err(&pdev->dev, "Failed to obtain io memory\n");
-                       return -ENOENT;
-       }
+       dev->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(dev->regs))
+               return PTR_ERR(dev->regs);
 
        dev->clk = clk_get(&pdev->dev, "sclk_fimg2d");
        if (IS_ERR_OR_NULL(dev->clk)) {

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 17983c4c9a9aca9a12e63e60853bde15a0f5f6ca..3b023752bcb4cd29d8e0ea17a851580ae69a1554 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1325,11 +1325,9 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
        /* memory-mapped registers */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       jpeg->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (jpeg->regs == NULL) {
-               dev_err(&pdev->dev, "Failed to obtain io memory\n");
-               return -ENOENT;
-       }
+       jpeg->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(jpeg->regs))
+               return PTR_ERR(jpeg->regs);
 
        /* interrupt service routine registration */
        jpeg->irq = ret = platform_get_irq(pdev, 0);

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 379f574337119e4aecc60896e3ae0fc6fc336e39..b2e9e1af18d558c2eca03729e2aa678f7a6a4a87 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1061,11 +1061,9 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       dev->regs_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (dev->regs_base == NULL) {
-               dev_err(&pdev->dev, "Failed to obtain io memory\n");
-               return -ENOENT;
-       }
+       dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(dev->regs_base))
+               return PTR_ERR(dev->regs_base);
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (res == NULL) {

diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 8bda2c908aba3b17aa53dc44f96474aca76a284f..1abdc7d9c7442e579d01be35113e7d2d9017626b 100644 (file)
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1707,9 +1707,9 @@ static int mx27_camera_emma_init(struct platform_device *pdev)
                goto out;
        }
 
-       pcdev->base_emma = devm_request_and_ioremap(pcdev->dev, res_emma);
-       if (!pcdev->base_emma) {
-               err = -EADDRNOTAVAIL;
+       pcdev->base_emma = devm_ioremap_resource(pcdev->dev, res_emma);
+       if (IS_ERR(pcdev->base_emma)) {
+               err = PTR_ERR(pcdev->base_emma);
                goto out;
        }
 
@@ -1824,9 +1824,9 @@ static int mx2_camera_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&pcdev->discard);
        spin_lock_init(&pcdev->lock);
 
-       pcdev->base_csi = devm_request_and_ioremap(&pdev->dev, res_csi);
-       if (!pcdev->base_csi) {
-               err = -EADDRNOTAVAIL;
+       pcdev->base_csi = devm_ioremap_resource(&pdev->dev, res_csi);
+       if (IS_ERR(pcdev->base_csi)) {
+               err = PTR_ERR(pcdev->base_csi);
                goto exit;
        }