ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()
authorMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 11:40:47 +0000 (12:40 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 27 Jun 2013 08:45:23 +0000 (09:45 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/txx9/txx9aclc-ac97.c

index 8a2840304d288e80cbce6e0b7946d354eaa8b1cb..8ee8d42200144e914cfdb15483834d851e633cf2 100644 (file)
@@ -188,9 +188,9 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
        if (!r)
                return -EBUSY;
 
-       if (!devm_request_mem_region(&pdev->dev, r->start, resource_size(r),
-                                    dev_name(&pdev->dev)))
-               return -EBUSY;
+       drvdata->base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(drvdata->base))
+               return PTR_ERR(drvdata->base);
 
        drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
@@ -201,9 +201,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
            r->start >= TXX9_DIRECTMAP_BASE &&
            r->start < TXX9_DIRECTMAP_BASE + 0x400000)
                drvdata->physbase |= 0xf00000000ull;
-       drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
-       if (!drvdata->base)
-               return -EBUSY;
        err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq,
                               0, dev_name(&pdev->dev), drvdata);
        if (err < 0)