hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: davinci-mcasp.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.

In this case, the original code did not contain a call to iounmap, nor does
one appear anywhere else in the file.  I have assumed that it is safe to
use devm_ioremap for the allocation in any case.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Julia Lawall 2011-12-29 17:51:21 +01:00 committed by Mark Brown
parent a3bb8f3f81
commit 96d31e2b12
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/soc/davinci/davinci-mcasp.c
View File

@ -865,38 +865,35 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
struct resource *mem, *ioarea, *res; struct resource *mem, *ioarea, *res;
struct snd_platform_data *pdata; struct snd_platform_data *pdata;
struct davinci_audio_dev *dev; struct davinci_audio_dev *dev;
int ret = 0; int ret;
dev = kzalloc(sizeof(struct davinci_audio_dev), GFP_KERNEL); dev = devm_kzalloc(&pdev->dev, sizeof(struct davinci_audio_dev),
GFP_KERNEL);
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { if (!mem) {
dev_err(&pdev->dev, "no mem resource?\n"); dev_err(&pdev->dev, "no mem resource?\n");
ret = -ENODEV; return -ENODEV;
goto err_release_data;
} }
ioarea = request_mem_region(mem->start, ioarea = devm_request_mem_region(&pdev->dev, mem->start,
resource_size(mem), pdev->name); resource_size(mem), pdev->name);
if (!ioarea) { if (!ioarea) {
dev_err(&pdev->dev, "Audio region already claimed\n"); dev_err(&pdev->dev, "Audio region already claimed\n");
ret = -EBUSY; return -EBUSY;
goto err_release_data;
} }
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
dev->clk = clk_get(&pdev->dev, NULL); dev->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(dev->clk)) { if (IS_ERR(dev->clk))
ret = -ENODEV; return -ENODEV;
goto err_release_region;
}
clk_enable(dev->clk); clk_enable(dev->clk);
dev->clk_active = 1; dev->clk_active = 1;
dev->base = ioremap(mem->start, resource_size(mem)); dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
if (!dev->base) { if (!dev->base) {
dev_err(&pdev->dev, "ioremap failed\n"); dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM; ret = -ENOMEM;
@ -924,7 +921,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
if (!res) { if (!res) {
dev_err(&pdev->dev, "no DMA resource\n"); dev_err(&pdev->dev, "no DMA resource\n");
ret = -ENODEV; ret = -ENODEV;
goto err_iounmap; goto err_release_clk;
} }
dma_data->channel = res->start; dma_data->channel = res->start;
@ -940,7 +937,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
if (!res) { if (!res) {
dev_err(&pdev->dev, "no DMA resource\n"); dev_err(&pdev->dev, "no DMA resource\n");
ret = -ENODEV; ret = -ENODEV;
goto err_iounmap; goto err_release_clk;
} }
dma_data->channel = res->start; dma_data->channel = res->start;
@ -948,37 +945,24 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]); ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]);
if (ret != 0) if (ret != 0)
goto err_iounmap; goto err_release_clk;
return 0; return 0;
err_iounmap:
iounmap(dev->base);
err_release_clk: err_release_clk:
clk_disable(dev->clk); clk_disable(dev->clk);
clk_put(dev->clk); clk_put(dev->clk);
err_release_region:
release_mem_region(mem->start, resource_size(mem));
err_release_data:
kfree(dev);
return ret; return ret;
} }
static int davinci_mcasp_remove(struct platform_device *pdev) static int davinci_mcasp_remove(struct platform_device *pdev)
{ {
struct davinci_audio_dev *dev = dev_get_drvdata(&pdev->dev); struct davinci_audio_dev *dev = dev_get_drvdata(&pdev->dev);
struct resource *mem;
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
clk_disable(dev->clk); clk_disable(dev->clk);
clk_put(dev->clk); clk_put(dev->clk);
dev->clk = NULL; dev->clk = NULL;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(mem->start, resource_size(mem));
kfree(dev);
return 0; return 0;
} }