From: Sebastien Guiriec <s-guiriec@ti.com>
Date: Wed, 13 Feb 2013 07:22:07 +0000 (+0100)
Subject: ASoC: omap-dmic: Clean up with devm_request_and_ioremap
X-Git-Tag: v3.10-rc1~14^2~20^2~3^2~22^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f224c612438e0c2067594636c6998ce5048d228;p=uclinux-h8%2Flinux.git

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>
---

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)
 		goto err_put_clk;
 	}
 
-	if (!devm_request_mem_region(&pdev->dev, res->start,
-				     resource_size(res), pdev->name)) {
-		dev_err(dmic->dev, "memory region already claimed\n");
-		ret = -ENODEV;
-		goto err_put_clk;
-	}
-
-	dmic->io_base = devm_ioremap(&pdev->dev, res->start,
-				     resource_size(res));
+	dmic->io_base = devm_request_and_ioremap(&pdev->dev, res);
 	if (!dmic->io_base) {
+		dev_err(&pdev->dev, "cannot remap\n");
 		ret = -ENOMEM;
 		goto err_put_clk;
 	}