diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-21 05:09:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-22 14:41:58 -0500 |
commit | b25b5aa06667b01fee8fe2648d4ea9db32c87d1a (patch) | |
tree | 9d6ec95d418fce9bc5923d6c7f3e2ab8bf8ada72 /sound/soc/fsl/imx-audmux.c | |
parent | 4d6dc3a73543336be8d81ba748772c09730cf557 (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/fsl/imx-audmux.c')
-rw-r--r-- | sound/soc/fsl/imx-audmux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 251f4d981e0c..c21ac9c7081e 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c | |||
@@ -252,9 +252,9 @@ static int imx_audmux_probe(struct platform_device *pdev) | |||
252 | of_match_device(imx_audmux_dt_ids, &pdev->dev); | 252 | of_match_device(imx_audmux_dt_ids, &pdev->dev); |
253 | 253 | ||
254 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 254 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
255 | audmux_base = devm_request_and_ioremap(&pdev->dev, res); | 255 | audmux_base = devm_ioremap_resource(&pdev->dev, res); |
256 | if (!audmux_base) | 256 | if (IS_ERR(audmux_base)) |
257 | return -EADDRNOTAVAIL; | 257 | return PTR_ERR(audmux_base); |
258 | 258 | ||
259 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | 259 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); |
260 | if (IS_ERR(pinctrl)) { | 260 | if (IS_ERR(pinctrl)) { |