summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-07-28 21:21:00 +0800
committerMark Brown <broonie@linaro.org>2014-07-28 14:46:20 +0100
commit55b219440b255f9b9064c621550d29e5f4f8c20f (patch)
tree1393a20ec32e7c8bc99c4f7e69dc9dbe95755294 /sound/soc/rockchip
parent4c5258acfe7115382808a6697596b5efb91e2380 (diff)
downloadlinux-55b219440b255f9b9064c621550d29e5f4f8c20f.tar.bz2
ASoC: rockchip: remove redundant dev_err call in rockchip_i2s_probe()
There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/rockchip')
-rw-r--r--sound/soc/rockchip/rockchip_i2s.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 4203088518f0..8d8e4b59049f 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -428,10 +428,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
regs = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(regs)) {
- dev_err(&pdev->dev, "No memory resource\n");
+ if (IS_ERR(regs))
return PTR_ERR(regs);
- }
i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
&rockchip_i2s_regmap_config);