Commit a3bb8f3f authored by Julia Lawall's avatar Julia Lawall Committed by Mark Brown

ASoC: davinci-vcif.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 6945e9f9
...@@ -210,7 +210,9 @@ static int davinci_vcif_probe(struct platform_device *pdev) ...@@ -210,7 +210,9 @@ static int davinci_vcif_probe(struct platform_device *pdev)
struct davinci_vcif_dev *davinci_vcif_dev; struct davinci_vcif_dev *davinci_vcif_dev;
int ret; int ret;
davinci_vcif_dev = kzalloc(sizeof(struct davinci_vcif_dev), GFP_KERNEL); davinci_vcif_dev = devm_kzalloc(&pdev->dev,
sizeof(struct davinci_vcif_dev),
GFP_KERNEL);
if (!davinci_vcif_dev) { if (!davinci_vcif_dev) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"could not allocate memory for private data\n"); "could not allocate memory for private data\n");
...@@ -235,23 +237,15 @@ static int davinci_vcif_probe(struct platform_device *pdev) ...@@ -235,23 +237,15 @@ static int davinci_vcif_probe(struct platform_device *pdev)
ret = snd_soc_register_dai(&pdev->dev, &davinci_vcif_dai); ret = snd_soc_register_dai(&pdev->dev, &davinci_vcif_dai);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "could not register dai\n"); dev_err(&pdev->dev, "could not register dai\n");
goto fail; return ret;
} }
return 0; return 0;
fail:
kfree(davinci_vcif_dev);
return ret;
} }
static int davinci_vcif_remove(struct platform_device *pdev) static int davinci_vcif_remove(struct platform_device *pdev)
{ {
struct davinci_vcif_dev *davinci_vcif_dev = dev_get_drvdata(&pdev->dev);
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
kfree(davinci_vcif_dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment