ASoC: use resource_size for au1x

Use the resource_size function instead of manually calculating the
resource size.This patch can reduce the chance of introducing off-by-one
errors.

Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Acked-by: Manuel Lauss <manuel.lauss@googlemail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index a61ccd2d505f010fd9720a29c8ce318e7d27819e..d14a5a91a4654dc347af790ace1244479659fb36 100644 (file)
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -375,12 +375,10 @@ static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
        }
 
        ret = -EBUSY;
-       wd->ioarea = request_mem_region(r->start, r->end - r->start + 1,
-                                       "au1xpsc_ac97");
-       if (!wd->ioarea)
+       if (!request_mem_region(r->start, resource_size(r), pdev->name))
                goto out0;
 
-       wd->mmio = ioremap(r->start, 0xffff);
+       wd->mmio = ioremap(r->start, resource_size(r));
        if (!wd->mmio)
                goto out1;
 
@@ -410,8 +408,7 @@ static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev)
 
        snd_soc_unregister_dai(&au1xpsc_ac97_dai);
 out1:
-       release_resource(wd->ioarea);
-       kfree(wd->ioarea);
+       release_mem_region(r->start, resource_size(r));
 out0:
        kfree(wd);
        return ret;
@@ -420,6 +417,7 @@ out0:
 static int __devexit au1xpsc_ac97_drvremove(struct platform_device *pdev)
 {
        struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
+       struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
        if (wd->dmapd)
                au1xpsc_pcm_destroy(wd->dmapd);
@@ -433,8 +431,7 @@ static int __devexit au1xpsc_ac97_drvremove(struct platform_device *pdev)
        au_sync();
 
        iounmap(wd->mmio);
-       release_resource(wd->ioarea);
-       kfree(wd->ioarea);
+       release_mem_region(r->start, resource_size(r));
        kfree(wd);
 
        au1xpsc_ac97_workdata = NULL;   /* MDEV */

diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index 495be6e7193169fcdf22400a682915d4966c3cc9..737b2384f6c581309f2f9b63479f9d878ea6ec26 100644 (file)
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -321,12 +321,10 @@ static int __init au1xpsc_i2s_drvprobe(struct platform_device *pdev)
        }
 
        ret = -EBUSY;
-       wd->ioarea = request_mem_region(r->start, r->end - r->start + 1,
-                                       "au1xpsc_i2s");
-       if (!wd->ioarea)
+       if (!request_mem_region(r->start, resource_size(r), pdev->name))
                goto out0;
 
-       wd->mmio = ioremap(r->start, 0xffff);
+       wd->mmio = ioremap(r->start, resource_size(r));
        if (!wd->mmio)
                goto out1;
 
@@ -362,8 +360,7 @@ static int __init au1xpsc_i2s_drvprobe(struct platform_device *pdev)
 
        snd_soc_unregister_dai(&au1xpsc_i2s_dai);
 out1:
-       release_resource(wd->ioarea);
-       kfree(wd->ioarea);
+       release_mem_region(r->start, resource_size(r));
 out0:
        kfree(wd);
        return ret;
@@ -372,6 +369,7 @@ out0:
 static int __devexit au1xpsc_i2s_drvremove(struct platform_device *pdev)
 {
        struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
+       struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
        if (wd->dmapd)
                au1xpsc_pcm_destroy(wd->dmapd);
@@ -384,8 +382,7 @@ static int __devexit au1xpsc_i2s_drvremove(struct platform_device *pdev)
        au_sync();
 
        iounmap(wd->mmio);
-       release_resource(wd->ioarea);
-       kfree(wd->ioarea);
+       release_mem_region(r->start, resource_size(r));
        kfree(wd);
 
        au1xpsc_i2s_workdata = NULL;    /* MDEV */

diff --git a/sound/soc/au1x/psc.h b/sound/soc/au1x/psc.h
index 32d3807d3f5a0d523cdf30a0fde24208f7112db4..093775d4dc3e47185759c737e1bb18338a615b7c 100644 (file)
--- a/sound/soc/au1x/psc.h
+++ b/sound/soc/au1x/psc.h
@@ -32,7 +32,6 @@ struct au1xpsc_audio_data {
        unsigned long rate;
 
        unsigned long pm[2];
-       struct resource *ioarea;
        struct mutex lock;
        struct platform_device *dmapd;
 };