mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()
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:
parent
2d65943e55
commit
5f85d20d04
1 changed files with 1 additions and 3 deletions
|
@ -399,7 +399,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
|
|||
int alm_irq = platform_get_irq_byname(pdev, "ALM");
|
||||
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)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -434,7 +434,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
|
||||
err:
|
||||
kfree(wm831x_rtc);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -445,7 +444,6 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
|
|||
|
||||
free_irq(alm_irq, wm831x_rtc);
|
||||
rtc_device_unregister(wm831x_rtc->rtc);
|
||||
kfree(wm831x_rtc);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue