[alsa-devel] [PATCH 2/2] ASoC: axi-spdif: Use devm_ioremap_resource() instead of devm_request_and_ioremap()

Lars-Peter Clausen lars at metafoo.de
Mon Dec 16 13:07:24 CET 2013


From: Fengguang Wu <fengguang.wu at intel.com>

devm_request_and_ioremap() has been deprecated in favour of
devm_ioremap_resource(). Fixes the following coccinelle warning:

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

Generated by: coccinelle/api/devm_ioremap_resource.cocci

Signed-off-by: Fengguang Wu <fengguang.wu at intel.com>
Signed-off-by: Lars-Peter Clausen <lars at metafoo.de>
---
 sound/soc/adi/axi-spdif.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/adi/axi-spdif.c b/sound/soc/adi/axi-spdif.c
index d5408d2..8db7a99 100644
--- a/sound/soc/adi/axi-spdif.c
+++ b/sound/soc/adi/axi-spdif.c
@@ -191,9 +191,9 @@ static int axi_spdif_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, spdif);
 
 	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);
 
 	spdif->regmap = devm_regmap_init_mmio(&pdev->dev, base,
 					    &axi_spdif_regmap_config);
-- 
1.8.0



More information about the Alsa-devel mailing list