ASoC: axi-spdif: Use devm_ioremap_resource() instead of devm_request_and_ioremap()
authorFengguang Wu <fengguang.wu@intel.com>
Mon, 16 Dec 2013 12:07:23 +0000 (13:07 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Dec 2013 20:45:39 +0000 (20:45 +0000)
devm_request_and_ioremap() has been deprecated in favour of
devm_ioremap_resource(). Fixes the following coccinelle warning:

sound/soc/adi/axi-i2s.c:195:8-32: ERROR: deprecated devm_request_and_ioremap() API used on line 195

Generated by: coccinelle/api/devm_ioremap_resource.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/adi/axi-i2s.c

index 0822c77..7f91a86 100644 (file)
@@ -192,9 +192,9 @@ static int axi_i2s_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, i2s);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!base)
-               return -EBUSY;
+       base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
        i2s->regmap = devm_regmap_init_mmio(&pdev->dev, base,
                &axi_i2s_regmap_config);