evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()

Browse source 
Marginally less code and eliminate the possibility of memory leaks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mark Brown 2012-01-10 15:10:44 -08:00 • committed by Linus Torvalds
parent 2d65943e55
commit 5f85d20d04
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/rtc/rtc-wm831x.c
View file

@ -399,7 +399,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
int alm_irq = platform_get_irq_byname(pdev, "ALM"); int alm_irq = platform_get_irq_byname(pdev, "ALM");
int ret = 0; int ret = 0;
wm831x_rtc = kzalloc(sizeof(*wm831x_rtc), GFP_KERNEL); wm831x_rtc = devm_kzalloc(&pdev->dev, sizeof(*wm831x_rtc), GFP_KERNEL);
if (wm831x_rtc == NULL) if (wm831x_rtc == NULL)
return -ENOMEM; return -ENOMEM;
@ -434,7 +434,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
kfree(wm831x_rtc);
return ret; return ret;
} }
@ -445,7 +444,6 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
free_irq(alm_irq, wm831x_rtc); free_irq(alm_irq, wm831x_rtc);
rtc_device_unregister(wm831x_rtc->rtc); rtc_device_unregister(wm831x_rtc->rtc);
kfree(wm831x_rtc);
return 0; return 0;
} }