ASoC: 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>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 282d8b1163ba..c74c89065493 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -472,11 +472,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        priv->io = devm_request_and_ioremap(&pdev->dev, mem);
-        if (!priv->io) {
-                dev_err(&pdev->dev, "devm_request_and_ioremap failed\n");
-                return -ENOMEM;
-        }
+        priv->io = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(priv->io))
+                return PTR_ERR(priv->io);
 
         priv->irq = platform_get_irq(pdev, 0);
         if (priv->irq <= 0) {