diff options
author | Sebastien Guiriec <s-guiriec@ti.com> | 2013-02-13 02:22:07 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-03 22:17:28 -0500 |
commit | 4f224c612438e0c2067594636c6998ce5048d228 (patch) | |
tree | d060428bdc11d463125e51c1372375b996b7dead /sound/soc/omap | |
parent | ddd17531ad9089ca1a758cd53fb698f396665cb5 (diff) |
ASoC: omap-dmic: Clean up with devm_request_and_ioremap
Clean up dmic code with devm_request_and_ioremap function.
Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/omap-dmic.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index ba49ccd9eed9..77e9e7e68edc 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c | |||
@@ -493,16 +493,9 @@ static int asoc_dmic_probe(struct platform_device *pdev) | |||
493 | goto err_put_clk; | 493 | goto err_put_clk; |
494 | } | 494 | } |
495 | 495 | ||
496 | if (!devm_request_mem_region(&pdev->dev, res->start, | 496 | dmic->io_base = devm_request_and_ioremap(&pdev->dev, res); |
497 | resource_size(res), pdev->name)) { | ||
498 | dev_err(dmic->dev, "memory region already claimed\n"); | ||
499 | ret = -ENODEV; | ||
500 | goto err_put_clk; | ||
501 | } | ||
502 | |||
503 | dmic->io_base = devm_ioremap(&pdev->dev, res->start, | ||
504 | resource_size(res)); | ||
505 | if (!dmic->io_base) { | 497 | if (!dmic->io_base) { |
498 | dev_err(&pdev->dev, "cannot remap\n"); | ||
506 | ret = -ENOMEM; | 499 | ret = -ENOMEM; |
507 | goto err_put_clk; | 500 | goto err_put_clk; |
508 | } | 501 | } |