mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ASoC: i2sc.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: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
8d9626d728
commit
6d8955262a
1 changed files with 13 additions and 32 deletions
|
@ -227,69 +227,50 @@ static struct snd_soc_dai_driver au1xi2s_dai_driver = {
|
|||
|
||||
static int __devinit au1xi2s_drvprobe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
struct resource *iores, *dmares;
|
||||
struct au1xpsc_audio_data *ctx;
|
||||
|
||||
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
|
||||
ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
|
||||
if (!ctx)
|
||||
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),
|
||||
pdev->name))
|
||||
goto out0;
|
||||
if (!devm_request_mem_region(&pdev->dev, iores->start,
|
||||
resource_size(iores),
|
||||
pdev->name))
|
||||
return -EBUSY;
|
||||
|
||||
ctx->mmio = ioremap_nocache(iores->start, resource_size(iores));
|
||||
ctx->mmio = devm_ioremap_nocache(&pdev->dev, iores->start,
|
||||
resource_size(iores));
|
||||
if (!ctx->mmio)
|
||||
goto out1;
|
||||
return -EBUSY;
|
||||
|
||||
dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
|
||||
if (!dmares)
|
||||
goto out2;
|
||||
return -EBUSY;
|
||||
ctx->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = dmares->start;
|
||||
|
||||
dmares = platform_get_resource(pdev, IORESOURCE_DMA, 1);
|
||||
if (!dmares)
|
||||
goto out2;
|
||||
return -EBUSY;
|
||||
ctx->dmaids[SNDRV_PCM_STREAM_CAPTURE] = dmares->start;
|
||||
|
||||
platform_set_drvdata(pdev, ctx);
|
||||
|
||||
ret = snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver);
|
||||
if (ret)
|
||||
goto out2;
|
||||
|
||||
return 0;
|
||||
|
||||
out2:
|
||||
iounmap(ctx->mmio);
|
||||
out1:
|
||||
release_mem_region(iores->start, resource_size(iores));
|
||||
out0:
|
||||
kfree(ctx);
|
||||
return ret;
|
||||
return snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver);
|
||||
}
|
||||
|
||||
static int __devexit au1xi2s_drvremove(struct platform_device *pdev)
|
||||
{
|
||||
struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);
|
||||
struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
|
||||
snd_soc_unregister_dai(&pdev->dev);
|
||||
|
||||
WR(ctx, I2S_ENABLE, EN_D); /* clock off, disable */
|
||||
|
||||
iounmap(ctx->mmio);
|
||||
release_mem_region(r->start, resource_size(r));
|
||||
kfree(ctx);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue