android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: mxs-saif: use devm_ functions

Browse Source 
The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses these functions 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>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Julia Lawall 2012-02-10 09:17:01 +01:00 committed by Mark Brown
parent e2da26778c
commit 830eb8767d
1 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sound/soc/mxs/mxs-saif.c
View File

@ -630,7 +630,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
if (pdev->id >= ARRAY_SIZE(mxs_saif)) if (pdev->id >= ARRAY_SIZE(mxs_saif))
return -EINVAL; return -EINVAL;
saif = kzalloc(sizeof(*saif), GFP_KERNEL); saif = devm_kzalloc(&pdev->dev, sizeof(*saif), GFP_KERNEL);
if (!saif) if (!saif)
return -ENOMEM; return -ENOMEM;
@ -655,29 +655,16 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = PTR_ERR(saif->clk); ret = PTR_ERR(saif->clk);
dev_err(&pdev->dev, "Cannot get the clock: %d\n", dev_err(&pdev->dev, "Cannot get the clock: %d\n",
ret); ret);
goto failed_clk; return ret;
} }
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!iores) {
ret = -ENODEV;
dev_err(&pdev->dev, "failed to get io resource: %d\n",
ret);
goto failed_get_resource;
}
if (!request_mem_region(iores->start, resource_size(iores), saif->base = devm_request_and_ioremap(&pdev->dev, iores);
"mxs-saif")) {
dev_err(&pdev->dev, "request_mem_region failed\n");
ret = -EBUSY;
goto failed_get_resource;
}
saif->base = ioremap(iores->start, resource_size(iores));
if (!saif->base) { if (!saif->base) {
dev_err(&pdev->dev, "ioremap failed\n"); dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENODEV; ret = -ENODEV;
goto failed_ioremap; goto failed_get_resource;
} }
dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
@ -685,7 +672,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
dev_err(&pdev->dev, "failed to get dma resource: %d\n", dev_err(&pdev->dev, "failed to get dma resource: %d\n",
ret); ret);
goto failed_ioremap; goto failed_get_resource;
} }
saif->dma_param.chan_num = dmares->start; saif->dma_param.chan_num = dmares->start;
@ -694,14 +681,15 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = saif->irq; ret = saif->irq;
dev_err(&pdev->dev, "failed to get irq resource: %d\n", dev_err(&pdev->dev, "failed to get irq resource: %d\n",
ret); ret);
goto failed_get_irq1; goto failed_get_resource;
} }
saif->dev = &pdev->dev; saif->dev = &pdev->dev;
ret = request_irq(saif->irq, mxs_saif_irq, 0, "mxs-saif", saif); ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,
"mxs-saif", saif);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request irq\n"); dev_err(&pdev->dev, "failed to request irq\n");
goto failed_get_irq1; goto failed_get_resource;
} }
saif->dma_param.chan_irq = platform_get_irq(pdev, 1); saif->dma_param.chan_irq = platform_get_irq(pdev, 1);
@ -709,7 +697,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = saif->dma_param.chan_irq; ret = saif->dma_param.chan_irq;
dev_err(&pdev->dev, "failed to get dma irq resource: %d\n", dev_err(&pdev->dev, "failed to get dma irq resource: %d\n",
ret); ret);
goto failed_get_irq2; goto failed_get_resource;
} }
platform_set_drvdata(pdev, saif); platform_set_drvdata(pdev, saif);
@ -717,7 +705,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai); ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
if (ret) { if (ret) {
dev_err(&pdev->dev, "register DAI failed\n"); dev_err(&pdev->dev, "register DAI failed\n");
goto failed_register; goto failed_get_resource;
} }
saif->soc_platform_pdev = platform_device_alloc( saif->soc_platform_pdev = platform_device_alloc(
@ -740,36 +728,19 @@ static int mxs_saif_probe(struct platform_device *pdev)
platform_device_put(saif->soc_platform_pdev); platform_device_put(saif->soc_platform_pdev);
failed_pdev_alloc: failed_pdev_alloc:
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
failed_register:
failed_get_irq2:
free_irq(saif->irq, saif);
failed_get_irq1:
iounmap(saif->base);
failed_ioremap:
release_mem_region(iores->start, resource_size(iores));
failed_get_resource: failed_get_resource:
clk_put(saif->clk); clk_put(saif->clk);
failed_clk:
kfree(saif);
return ret; return ret;
} }
static int __devexit mxs_saif_remove(struct platform_device *pdev) static int __devexit mxs_saif_remove(struct platform_device *pdev)
{ {
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct mxs_saif *saif = platform_get_drvdata(pdev); struct mxs_saif *saif = platform_get_drvdata(pdev);
platform_device_unregister(saif->soc_platform_pdev); platform_device_unregister(saif->soc_platform_pdev);
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
iounmap(saif->base);
release_mem_region(res->start, resource_size(res));
free_irq(saif->irq, saif);
clk_put(saif->clk); clk_put(saif->clk);
kfree(saif);
return 0; return 0;
} }