diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-21 11:09:26 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-22 11:41:58 -0800 |
commit | b25b5aa06667b01fee8fe2648d4ea9db32c87d1a (patch) | |
tree | 9d6ec95d418fce9bc5923d6c7f3e2ab8bf8ada72 /sound/soc/mxs | |
parent | 4d6dc3a73543336be8d81ba748772c09730cf557 (diff) | |
download | blackbird-op-linux-b25b5aa06667b01fee8fe2648d4ea9db32c87d1a.tar.gz blackbird-op-linux-b25b5aa06667b01fee8fe2648d4ea9db32c87d1a.zip |
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/mxs')
-rw-r--r-- | sound/soc/mxs/mxs-saif.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 365d9d27a321..b327709eb192 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -724,11 +724,9 @@ static int mxs_saif_probe(struct platform_device *pdev) iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); - saif->base = devm_request_and_ioremap(&pdev->dev, iores); - if (!saif->base) { - dev_err(&pdev->dev, "ioremap failed\n"); - return -ENODEV; - } + saif->base = devm_ioremap_resource(&pdev->dev, iores); + if (IS_ERR(saif->base)) + return PTR_ERR(saif->base); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!dmares) { |