diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:30 -0400 |
commit | 418ca60c2c81b464ddfb3452f728a8c703c5807f (patch) | |
tree | 6f5e3652b55a461dc9525cf94b9b0cb5a52de1af | |
parent | 479243b2cd763744cd740c05e5d61abc1c518256 (diff) |
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>
-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) | |||
172 | while (readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TTS) | 172 | while (readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TTS) |
173 | usleep_range(1000, 3000); | 173 | usleep_range(1000, 3000); |
174 | 174 | ||
175 | rtcdev = rtc_device_register("ls1x-rtc", &pdev->dev, | 175 | rtcdev = devm_rtc_device_register(&pdev->dev, "ls1x-rtc", |
176 | &ls1x_rtc_ops , THIS_MODULE); | 176 | &ls1x_rtc_ops , THIS_MODULE); |
177 | if (IS_ERR(rtcdev)) { | 177 | if (IS_ERR(rtcdev)) { |
178 | ret = PTR_ERR(rtcdev); | 178 | ret = PTR_ERR(rtcdev); |
@@ -187,9 +187,6 @@ err: | |||
187 | 187 | ||
188 | static int ls1x_rtc_remove(struct platform_device *pdev) | 188 | static int ls1x_rtc_remove(struct platform_device *pdev) |
189 | { | 189 | { |
190 | struct rtc_device *rtcdev = platform_get_drvdata(pdev); | ||
191 | |||
192 | rtc_device_unregister(rtcdev); | ||
193 | platform_set_drvdata(pdev, NULL); | 190 | platform_set_drvdata(pdev, NULL); |
194 | 191 | ||
195 | return 0; | 192 | return 0; |