diff options
| author |   Jingoo Han <jg1.han@samsung.com> | 2013-04-29 16:19:39 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:28:30 -0700 |
| commit | 418ca60c2c81b464ddfb3452f728a8c703c5807f (patch) | |
| tree | 6f5e3652b55a461dc9525cf94b9b0cb5a52de1af /drivers/rtc/rtc-ls1x.c | |
| parent | rtc: hid-sensor-time: use devm_rtc_device_register() (diff) | |
| download | wireguard-linux-418ca60c2c81b464ddfb3452f728a8c703c5807f.tar.xz wireguard-linux-418ca60c2c81b464ddfb3452f728a8c703c5807f.zip | |
rtc: rtc-ls1x: 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>
Diffstat (limited to 'drivers/rtc/rtc-ls1x.c')
| -rw-r--r-- | drivers/rtc/rtc-ls1x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c index f59b6349551a..db82f91f4562 100644 --- a/drivers/rtc/rtc-ls1x.c +++ b/drivers/rtc/rtc-ls1x.c @@ -172,7 +172,7 @@ static int ls1x_rtc_probe(struct platform_device *pdev) while (readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TTS) usleep_range(1000, 3000); - rtcdev = rtc_device_register("ls1x-rtc", &pdev->dev, + rtcdev = devm_rtc_device_register(&pdev->dev, "ls1x-rtc", &ls1x_rtc_ops , THIS_MODULE); if (IS_ERR(rtcdev)) { ret = PTR_ERR(rtcdev); @@ -187,9 +187,6 @@ err: static int ls1x_rtc_remove(struct platform_device *pdev) { - struct rtc_device *rtcdev = platform_get_drvdata(pdev); - - rtc_device_unregister(rtcdev); platform_set_drvdata(pdev, NULL); return 0; |