hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtc: rtc-s3c: 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:19:11 -07:00 committed by Linus Torvalds
parent 288031bfef
commit 4c99c13ad7
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rtc/rtc-s3c.c
View File

@ -423,10 +423,7 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
static int s3c_rtc_remove(struct platform_device *dev) static int s3c_rtc_remove(struct platform_device *dev)
{ {
struct rtc_device *rtc = platform_get_drvdata(dev);
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
rtc_device_unregister(rtc);
s3c_rtc_setaie(&dev->dev, 0); s3c_rtc_setaie(&dev->dev, 0);
@ -511,7 +508,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
/* register RTC and exit */ /* register RTC and exit */
rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops, rtc = devm_rtc_device_register(&pdev->dev, "s3c", &s3c_rtcops,
THIS_MODULE); THIS_MODULE);
if (IS_ERR(rtc)) { if (IS_ERR(rtc)) {
@ -574,7 +571,6 @@ static int s3c_rtc_probe(struct platform_device *pdev)
err_alarm_irq: err_alarm_irq:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
rtc_device_unregister(rtc);
err_nortc: err_nortc:
s3c_rtc_enable(pdev, 0); s3c_rtc_enable(pdev, 0);