diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:29 -0400 |
commit | 6c0686057fe18754060842b525112b46d4f72ba4 (patch) | |
tree | f51e45bd497be02d08a32b1c2fa03e1c444cc326 /drivers/rtc/rtc-au1xxx.c | |
parent | ef886c4d75f0872424f61815662dd37e84b2d34e (diff) |
rtc: rtc-au1xxx: 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-au1xxx.c')
-rw-r--r-- | drivers/rtc/rtc-au1xxx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c index dfd6d6638aa3..7995abc391fc 100644 --- a/drivers/rtc/rtc-au1xxx.c +++ b/drivers/rtc/rtc-au1xxx.c | |||
@@ -101,7 +101,7 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev) | |||
101 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S) | 101 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S) |
102 | msleep(1); | 102 | msleep(1); |
103 | 103 | ||
104 | rtcdev = rtc_device_register("rtc-au1xxx", &pdev->dev, | 104 | rtcdev = devm_rtc_device_register(&pdev->dev, "rtc-au1xxx", |
105 | &au1xtoy_rtc_ops, THIS_MODULE); | 105 | &au1xtoy_rtc_ops, THIS_MODULE); |
106 | if (IS_ERR(rtcdev)) { | 106 | if (IS_ERR(rtcdev)) { |
107 | ret = PTR_ERR(rtcdev); | 107 | ret = PTR_ERR(rtcdev); |
@@ -118,9 +118,6 @@ out_err: | |||
118 | 118 | ||
119 | static int au1xtoy_rtc_remove(struct platform_device *pdev) | 119 | static int au1xtoy_rtc_remove(struct platform_device *pdev) |
120 | { | 120 | { |
121 | struct rtc_device *rtcdev = platform_get_drvdata(pdev); | ||
122 | |||
123 | rtc_device_unregister(rtcdev); | ||
124 | platform_set_drvdata(pdev, NULL); | 121 | platform_set_drvdata(pdev, NULL); |
125 | 122 | ||
126 | return 0; | 123 | return 0; |