Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-07 20:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: omap: convert to devm_ioremap_resource()

Browse Source 
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: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Silviu-Mihai Popescu 2013-03-11 17:58:57 +02:00 committed by Mark Brown
parent e37e04307c
commit 77c641d346
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/omap/omap-dmic.c
View File

@ -493,12 +493,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
goto err_put_clk; goto err_put_clk;
} }
dmic->io_base = devm_request_and_ioremap(&pdev->dev, res); dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
if (!dmic->io_base) { if (IS_ERR(dmic->io_base))
dev_err(&pdev->dev, "cannot remap\n"); return PTR_ERR(dmic->io_base);
ret = -ENOMEM;
goto err_put_clk;
}
ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai); ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
if (ret) if (ret)

8
sound/soc/omap/omap-mcpdm.c
View File

@ -464,11 +464,9 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
if (res == NULL) if (res == NULL)
return -ENOMEM; return -ENOMEM;
mcpdm->io_base = devm_request_and_ioremap(&pdev->dev, res); mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);
if (!mcpdm->io_base) { if (IS_ERR(mcpdm->io_base))
dev_err(&pdev->dev, "cannot remap\n"); return PTR_ERR(mcpdm->io_base);
return -ENOMEM;
}
mcpdm->irq = platform_get_irq(pdev, 0); mcpdm->irq = platform_get_irq(pdev, 0);
if (mcpdm->irq < 0) if (mcpdm->irq < 0)