FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 01:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfd: davinci_voicecodec: Convert to managed resources for allocating memory

Browse Source 
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Lee Jones 2013-05-23 16:25:11 +01:00 committed by Samuel Ortiz
parent 22f9ee756b
commit 099053a497
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mfd/davinci_voicecodec.c
View File

@ -50,7 +50,8 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
struct mfd_cell *cell = NULL; struct mfd_cell *cell = NULL;
int ret; int ret;
davinci_vc = kzalloc(sizeof(struct davinci_vc), GFP_KERNEL); davinci_vc = devm_kzalloc(&pdev->dev,
sizeof(struct davinci_vc), GFP_KERNEL);
if (!davinci_vc) { if (!davinci_vc) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"could not allocate memory for private data\n"); "could not allocate memory for private data\n");
@ -61,8 +62,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
if (IS_ERR(davinci_vc->clk)) { if (IS_ERR(davinci_vc->clk)) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"could not get the clock for voice codec\n"); "could not get the clock for voice codec\n");
ret = -ENODEV; return -ENODEV;
goto fail1;
} }
clk_enable(davinci_vc->clk); clk_enable(davinci_vc->clk);
@ -145,8 +145,6 @@ fail2:
clk_disable(davinci_vc->clk); clk_disable(davinci_vc->clk);
clk_put(davinci_vc->clk); clk_put(davinci_vc->clk);
davinci_vc->clk = NULL; davinci_vc->clk = NULL;
fail1:
kfree(davinci_vc);
return ret; return ret;
} }
@ -164,8 +162,6 @@ static int davinci_vc_remove(struct platform_device *pdev)
clk_put(davinci_vc->clk); clk_put(davinci_vc->clk);
davinci_vc->clk = NULL; davinci_vc->clk = NULL;
kfree(davinci_vc);
return 0; return 0;
} }