]> Pileus Git - ~andy/linux/commitdiff
ASoC: omap-dmic: Clean up with devm_request_and_ioremap
authorSebastien Guiriec <s-guiriec@ti.com>
Wed, 13 Feb 2013 07:22:07 +0000 (08:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 4 Mar 2013 03:17:28 +0000 (11:17 +0800)
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>
sound/soc/omap/omap-dmic.c

index ba49ccd9eed9149f234907c6efb66af5587328e6..77e9e7e68edcbdbaae6e6e512f4afd2ff2a0cea6 100644 (file)
@@ -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;
        }