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>
This commit is contained in:
parent
4d6dc3a735
commit
b25b5aa066
|
@ -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)
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -472,11 +472,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
priv->io = devm_request_and_ioremap(&pdev->dev, mem);
|
||||
if (!priv->io) {
|
||||
dev_err(&pdev->dev, "devm_request_and_ioremap failed\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
priv->io = devm_ioremap_resource(&pdev->dev, mem);
|
||||
if (IS_ERR(priv->io))
|
||||
return PTR_ERR(priv->io);
|
||||
|
||||
priv->irq = platform_get_irq(pdev, 0);
|
||||
if (priv->irq <= 0) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -429,9 +429,9 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev)
|
|||
if (res == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
priv->sspa->mmio_base = devm_request_and_ioremap(&pdev->dev, res);
|
||||
if (priv->sspa->mmio_base == NULL)
|
||||
return -ENODEV;
|
||||
priv->sspa->mmio_base = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(priv->sspa->mmio_base))
|
||||
return PTR_ERR(priv->sspa->mmio_base);
|
||||
|
||||
priv->sspa->clk = devm_clk_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(priv->sspa->clk))
|
||||
|
|
Loading…
Reference in a new issue