aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/cirrus/ep93xx-i2s.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 05:09:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-22 14:41:58 -0500
commitb25b5aa06667b01fee8fe2648d4ea9db32c87d1a (patch)
tree9d6ec95d418fce9bc5923d6c7f3e2ab8bf8ada72 /sound/soc/cirrus/ep93xx-i2s.c
parent4d6dc3a73543336be8d81ba748772c09730cf557 (diff)
ASoC: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() which provides more consistent error handling. devm_ioremap_resource() provides its own error messages so all explicit error messages can be removed from the failure code paths. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/cirrus/ep93xx-i2s.c')
-rw-r--r--sound/soc/cirrus/ep93xx-i2s.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 3365d4e843b7..323ed69b7975 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -380,9 +380,9 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
380 if (!res) 380 if (!res)
381 return -ENODEV; 381 return -ENODEV;
382 382
383 info->regs = devm_request_and_ioremap(&pdev->dev, res); 383 info->regs = devm_ioremap_resource(&pdev->dev, res);
384 if (!info->regs) 384 if (IS_ERR(info->regs))
385 return -ENXIO; 385 return PTR_ERR(info->regs);
386 386
387 info->mclk = clk_get(&pdev->dev, "mclk"); 387 info->mclk = clk_get(&pdev->dev, "mclk");
388 if (IS_ERR(info->mclk)) { 388 if (IS_ERR(info->mclk)) {