From: Fengguang Wu Date: Mon, 16 Dec 2013 12:07:23 +0000 (+0100) Subject: ASoC: axi-spdif: Use devm_ioremap_resource() instead of devm_request_and_ioremap() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7fd7a48bd584a66cc4b0e3b92bb75b061578e19e;p=openwrt%2Fstaging%2Fblogic.git ASoC: axi-spdif: Use devm_ioremap_resource() instead of devm_request_and_ioremap() 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 --- diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c index 0822c7713669..7f91a86dd734 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);