OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtc: rtc-davinci: use devm_rtc_device_register() 

devm_rtc_device_register() is device managed and makes cleanup
paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jingoo Han 2013-04-29 16:18:58 -07:00 committed by Linus Torvalds
parent 8c32edb57f
commit 8ae236b8c9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/rtc/rtc-davinci.c
View File

@ -523,7 +523,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, davinci_rtc); platform_set_drvdata(pdev, davinci_rtc);
davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, davinci_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&davinci_rtc_ops, THIS_MODULE); &davinci_rtc_ops, THIS_MODULE);
if (IS_ERR(davinci_rtc->rtc)) { if (IS_ERR(davinci_rtc->rtc)) {
ret = PTR_ERR(davinci_rtc->rtc); ret = PTR_ERR(davinci_rtc->rtc);
@ -543,7 +543,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
0, "davinci_rtc", davinci_rtc); 0, "davinci_rtc", davinci_rtc);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "unable to register davinci RTC interrupt\n"); dev_err(dev, "unable to register davinci RTC interrupt\n");
goto fail2; goto fail1;
} }
/* Enable interrupts */ /* Enable interrupts */
@ -557,8 +557,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
return 0; return 0;
fail2:
rtc_device_unregister(davinci_rtc->rtc);
fail1: fail1:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
return ret; return ret;
@ -572,8 +570,6 @@ static int __exit davinci_rtc_remove(struct platform_device *pdev)
rtcif_write(davinci_rtc, 0, PRTCIF_INTEN); rtcif_write(davinci_rtc, 0, PRTCIF_INTEN);
rtc_device_unregister(davinci_rtc->rtc);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
return 0; return 0;