mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
Replace the kzalloc() and kfree() calls with devm_kzalloc(). Signed-off-by: Devendra Naga <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Alexey Charkov <[email protected]> Acked-by: Tony Prisk <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
968d21c2cf
commit
0d7ecb8389
1 changed files with 5 additions and 10 deletions
|
|
@ -210,7 +210,8 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev)
|
|||
struct vt8500_rtc *vt8500_rtc;
|
||||
int ret;
|
||||
|
||||
vt8500_rtc = kzalloc(sizeof(struct vt8500_rtc), GFP_KERNEL);
|
||||
vt8500_rtc = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct vt8500_rtc), GFP_KERNEL);
|
||||
if (!vt8500_rtc)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -220,15 +221,13 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev)
|
|||
vt8500_rtc->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!vt8500_rtc->res) {
|
||||
dev_err(&pdev->dev, "No I/O memory resource defined\n");
|
||||
ret = -ENXIO;
|
||||
goto err_free;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
vt8500_rtc->irq_alarm = platform_get_irq(pdev, 0);
|
||||
if (vt8500_rtc->irq_alarm < 0) {
|
||||
dev_err(&pdev->dev, "No alarm IRQ resource defined\n");
|
||||
ret = -ENXIO;
|
||||
goto err_free;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
vt8500_rtc->res = request_mem_region(vt8500_rtc->res->start,
|
||||
|
|
@ -236,8 +235,7 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev)
|
|||
"vt8500-rtc");
|
||||
if (vt8500_rtc->res == NULL) {
|
||||
dev_err(&pdev->dev, "failed to request I/O memory\n");
|
||||
ret = -EBUSY;
|
||||
goto err_free;
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
vt8500_rtc->regbase = ioremap(vt8500_rtc->res->start,
|
||||
|
|
@ -278,8 +276,6 @@ err_unmap:
|
|||
err_release:
|
||||
release_mem_region(vt8500_rtc->res->start,
|
||||
resource_size(vt8500_rtc->res));
|
||||
err_free:
|
||||
kfree(vt8500_rtc);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -297,7 +293,6 @@ static int __devexit vt8500_rtc_remove(struct platform_device *pdev)
|
|||
release_mem_region(vt8500_rtc->res->start,
|
||||
resource_size(vt8500_rtc->res));
|
||||
|
||||
kfree(vt8500_rtc);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue