Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25b5aa0 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

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: default avatarThierry Reding <thierry.reding@avionic-design.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d6dc3a7

sound/soc/cirrus/ep93xx-ac97.c

+4 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <linux/delay.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/init.h>

#include <linux/module.h>
@@ -367,9 +368,9 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) 
	if (!res)

		return -ENODEV;



	info->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (!info->regs)

		return -ENXIO;

	info->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(info->regs))

		return PTR_ERR(info->regs);



	irq = platform_get_irq(pdev, 0);

	if (!irq)

sound/soc/cirrus/ep93xx-i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -380,9 +380,9 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) 
	if (!res)

		return -ENODEV;



	info->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (!info->regs)

		return -ENXIO;

	info->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(info->regs))

		return PTR_ERR(info->regs);



	info->mclk = clk_get(&pdev->dev, "mclk");

	if (IS_ERR(info->mclk)) {

sound/soc/codecs/jz4740.c

+3 −3
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ static int jz4740_codec_probe(struct platform_device *pdev) 
		return -ENOMEM;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_request_and_ioremap(&pdev->dev, mem);

	if (!base)

		return -EBUSY;

	base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(base))

		return PTR_ERR(base);



	jz4740_codec->regmap = devm_regmap_init_mmio(&pdev->dev, base,

					    &jz4740_codec_regmap_config);

sound/soc/fsl/imx-audmux.c

+3 −3
Original line number Diff line number Diff line
@@ -252,9 +252,9 @@ static int imx_audmux_probe(struct platform_device *pdev) 
			of_match_device(imx_audmux_dt_ids, &pdev->dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	audmux_base = devm_request_and_ioremap(&pdev->dev, res);

	if (!audmux_base)

		return -EADDRNOTAVAIL;

	audmux_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(audmux_base))

		return PTR_ERR(audmux_base);



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

sound/soc/fsl/imx-ssi.c

+3 −4
Original line number Diff line number Diff line
@@ -550,10 +550,9 @@ static int imx_ssi_probe(struct platform_device *pdev) 
		goto failed_get_resource;

	}



	ssi->base = devm_request_and_ioremap(&pdev->dev, res);

	if (!ssi->base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		ret = -ENODEV;

	ssi->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(ssi->base)) {

		ret = PTR_ERR(ssi->base);

		goto failed_register;

	}