ASoC: omap: 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: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2 files changed, 6 insertions, 11 deletions

diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 77e9e7e68edc..8ebaf117d81f 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -493,12 +493,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 goto err_put_clk;
         }
 
-        dmic->io_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!dmic->io_base) {
-                dev_err(&pdev->dev, "cannot remap\n");
-                ret = -ENOMEM;
-                goto err_put_clk;
-        }
+        dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(dmic->io_base))
+                return PTR_ERR(dmic->io_base);
 
         ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
         if (ret)
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 079f277cdba4..ddfcc1834ff0 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -464,11 +464,9 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
         if (res == NULL)
                 return -ENOMEM;
 
-        mcpdm->io_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!mcpdm->io_base) {
-                dev_err(&pdev->dev, "cannot remap\n");
-                return -ENOMEM;
-        }
+        mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(mcpdm->io_base))
+                return PTR_ERR(mcpdm->io_base);
 
         mcpdm->irq = platform_get_irq(pdev, 0);
         if (mcpdm->irq < 0)