Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ASoC: Convert jz4740 to devm_kzalloc()

Browse source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-26 20:55:01 +08:00 committed by Mark Brown
parent 38b81c1d25
commit 558460c65a
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/codecs/jz4740.c
View file

@ -353,7 +353,8 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev)
struct jz4740_codec *jz4740_codec; struct jz4740_codec *jz4740_codec;
struct resource *mem; struct resource *mem;
jz4740_codec = kzalloc(sizeof(*jz4740_codec), GFP_KERNEL); jz4740_codec = devm_kzalloc(&pdev->dev, sizeof(*jz4740_codec),
GFP_KERNEL);
if (!jz4740_codec) if (!jz4740_codec)
return -ENOMEM; return -ENOMEM;
@ -361,14 +362,14 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev)
if (!mem) { if (!mem) {
dev_err(&pdev->dev, "Failed to get mmio memory resource\n"); dev_err(&pdev->dev, "Failed to get mmio memory resource\n");
ret = -ENOENT; ret = -ENOENT;
goto err_free_codec; goto err_out;
} }
mem = request_mem_region(mem->start, resource_size(mem), pdev->name); mem = request_mem_region(mem->start, resource_size(mem), pdev->name);
if (!mem) { if (!mem) {
dev_err(&pdev->dev, "Failed to request mmio memory region\n"); dev_err(&pdev->dev, "Failed to request mmio memory region\n");
ret = -EBUSY; ret = -EBUSY;
goto err_free_codec; goto err_out;
} }
jz4740_codec->base = ioremap(mem->start, resource_size(mem)); jz4740_codec->base = ioremap(mem->start, resource_size(mem));
@ -394,9 +395,7 @@ err_iounmap:
iounmap(jz4740_codec->base); iounmap(jz4740_codec->base);
err_release_mem_region: err_release_mem_region:
release_mem_region(mem->start, resource_size(mem)); release_mem_region(mem->start, resource_size(mem));
err_free_codec: err_out:
kfree(jz4740_codec);
return ret; return ret;
} }
@ -411,7 +410,6 @@ static int __devexit jz4740_codec_remove(struct platform_device *pdev)
release_mem_region(mem->start, resource_size(mem)); release_mem_region(mem->start, resource_size(mem));
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(jz4740_codec);
return 0; return 0;
} }