summaryrefslogtreecommitdiff
path: root/sound/soc/adi/axi-i2s.c
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2013-12-16 16:07:23 +0400
committerMark Brown <broonie@linaro.org>2013-12-17 00:45:39 +0400
commit7fd7a48bd584a66cc4b0e3b92bb75b061578e19e (patch)
tree510b236b9d80ade119a756bc35081944bbe63df9 /sound/soc/adi/axi-i2s.c
parent429e4374cc007f260c7d0e2d0df5247deeaf8fbe (diff)
downloadlinux-7fd7a48bd584a66cc4b0e3b92bb75b061578e19e.tar.xz
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 <fengguang.wu@intel.com> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/adi/axi-i2s.c')
-rw-r--r--sound/soc/adi/axi-i2s.c6
1 files changed, 3 insertions, 3 deletions
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);