Dec 16 2013

ASoC: axi-spdif: Use devm_ioremap_resource() instead of devm_request_and_ioremap() 

Author: Fengguang Wu <fengguang.wu@intel.com>

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 
Signed-off-by: Lars-Peter Clausen 
Signed-off-by: Mark Brown 

---
 sound/soc/adi/axi-i2s.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 
diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c
index 0822c77..7f91a86 100644
--- a/sound/soc/adi/axi-i2s.c
+++ b/sound/soc/adi/axi-i2s.c
@@ -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);

qlambert