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

Commit aa4079c1 authored by Julia Lawall's avatar Julia Lawall Committed by Mark Brown
Browse files

ASoC: psc-i2s.c: use devm_ functions 



The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cd0ff7ef

sound/soc/au1x/psc-i2s.c

+14 −28
Original line number Diff line number Diff line
@@ -295,33 +295,34 @@ static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev) 
	int ret;

	struct au1xpsc_audio_data *wd;



	wd = kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL);

	wd = devm_kzalloc(&pdev->dev, sizeof(struct au1xpsc_audio_data),

			  GFP_KERNEL);

	if (!wd)

		return -ENOMEM;



	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!iores) {

		ret = -ENODEV;

		goto out0;

	}

	if (!iores)

		return -ENODEV;



	ret = -EBUSY;

	if (!request_mem_region(iores->start, resource_size(iores),

	if (!devm_request_mem_region(&pdev->dev, iores->start,

				     resource_size(iores),

				     pdev->name))

		goto out0;

		return -EBUSY;



	wd->mmio = ioremap(iores->start, resource_size(iores));

	wd->mmio = devm_ioremap(&pdev->dev, iores->start,

				resource_size(iores));

	if (!wd->mmio)

		goto out1;

		return -EBUSY;



	dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);

	if (!dmares)

		goto out2;

		return -EBUSY;

	wd->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = dmares->start;



	dmares = platform_get_resource(pdev, IORESOURCE_DMA, 1);

	if (!dmares)

		goto out2;

		return -EBUSY;

	wd->dmaids[SNDRV_PCM_STREAM_CAPTURE] = dmares->start;



	/* preserve PSC clock source set up by platform (dev.platform_data
@@ -349,23 +350,12 @@ static int __devinit au1xpsc_i2s_drvprobe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, wd);



	ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv);

	if (!ret)

		return 0;



out2:

	iounmap(wd->mmio);

out1:

	release_mem_region(iores->start, resource_size(iores));

out0:

	kfree(wd);

	return ret;

	return snd_soc_register_dai(&pdev->dev, &wd->dai_drv);

}



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);



	snd_soc_unregister_dai(&pdev->dev);
@@ -374,10 +364,6 @@ static int __devexit au1xpsc_i2s_drvremove(struct platform_device *pdev) 
	au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));

	au_sync();



	iounmap(wd->mmio);

	release_mem_region(r->start, resource_size(r));

	kfree(wd);



	return 0;

}