Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0da5500 authored by Wan ZongShun's avatar Wan ZongShun Committed by Mark Brown
Browse files

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: default avatarWan ZongShun <mcuos.com@gmail.com>
Acked-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5ef650ae

sound/soc/au1x/psc-ac97.c

+5 −8
Original line number Diff line number Diff line
@@ -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 */

sound/soc/au1x/psc-i2s.c

+5 −8
Original line number Diff line number Diff line
@@ -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 */

sound/soc/au1x/psc.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};