aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/cirrus/ep93xx-ac97.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-ac97.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-ac97.c')
-rw-r--r--sound/soc/cirrus/ep93xx-ac97.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index f3f50e6fd6eb..1738d28fb04f 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -11,6 +11,7 @@
11 */ 11 */
12 12
13#include <linux/delay.h> 13#include <linux/delay.h>
14#include <linux/err.h>
14#include <linux/io.h> 15#include <linux/io.h>
15#include <linux/init.h> 16#include <linux/init.h>
16#include <linux/module.h> 17#include <linux/module.h>
@@ -367,9 +368,9 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
367 if (!res) 368 if (!res)
368 return -ENODEV; 369 return -ENODEV;
369 370
370 info->regs = devm_request_and_ioremap(&pdev->dev, res); 371 info->regs = devm_ioremap_resource(&pdev->dev, res);
371 if (!info->regs) 372 if (IS_ERR(info->regs))
372 return -ENXIO; 373 return PTR_ERR(info->regs);
373 374
374 irq = platform_get_irq(pdev, 0); 375 irq = platform_get_irq(pdev, 0);
375 if (!irq) 376 if (!irq)