]> Pileus Git - ~andy/linux/commitdiff
ASoC: tegra20-ac97: Convert to devm_ioremap_resource()
authorMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 11:18:39 +0000 (12:18 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 27 Jun 2013 08:45:06 +0000 (09:45 +0100)
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/tegra/tegra20_ac97.c

index d8c142dc93e406359b6cd7e4bef49d7e40d7a1b1..9043626da6fab8aea78fe3ff6eaad439617ade44 100644 (file)
@@ -341,18 +341,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
                goto err_clk_put;
        }
 
-       memregion = devm_request_mem_region(&pdev->dev, mem->start,
-                                           resource_size(mem), DRV_NAME);
-       if (!memregion) {
-               dev_err(&pdev->dev, "Memory region already claimed\n");
-               ret = -EBUSY;
-               goto err_clk_put;
-       }
-
-       regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-       if (!regs) {
-               dev_err(&pdev->dev, "ioremap failed\n");
-               ret = -ENOMEM;
+       regs = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(regs)) {
+               ret = PTR_ERR(regs);
+               dev_err(&pdev->dev, "ioremap failed: %d\n", ret);
                goto err_clk_put;
        }