diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:27 -0400 |
commit | 97868b3225b74e9982c70717e3174a13bd9cc765 (patch) | |
tree | b2e3663b686b8f48c91ddbfbf0faff0dc90091dd | |
parent | 77cf81b39f4d085077b5f11e9bb485a79b95a6a5 (diff) |
rtc: rtc-tps65910: 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-tps65910.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c index 8bd8115329b5..ef5d199af298 100644 --- a/drivers/rtc/rtc-tps65910.c +++ b/drivers/rtc/rtc-tps65910.c | |||
@@ -276,7 +276,7 @@ static int tps65910_rtc_probe(struct platform_device *pdev) | |||
276 | tps_rtc->irq = irq; | 276 | tps_rtc->irq = irq; |
277 | device_set_wakeup_capable(&pdev->dev, 1); | 277 | device_set_wakeup_capable(&pdev->dev, 1); |
278 | 278 | ||
279 | tps_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, | 279 | tps_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, |
280 | &tps65910_rtc_ops, THIS_MODULE); | 280 | &tps65910_rtc_ops, THIS_MODULE); |
281 | if (IS_ERR(tps_rtc->rtc)) { | 281 | if (IS_ERR(tps_rtc->rtc)) { |
282 | ret = PTR_ERR(tps_rtc->rtc); | 282 | ret = PTR_ERR(tps_rtc->rtc); |
@@ -295,12 +295,8 @@ static int tps65910_rtc_probe(struct platform_device *pdev) | |||
295 | */ | 295 | */ |
296 | static int tps65910_rtc_remove(struct platform_device *pdev) | 296 | static int tps65910_rtc_remove(struct platform_device *pdev) |
297 | { | 297 | { |
298 | /* leave rtc running, but disable irqs */ | ||
299 | struct tps65910_rtc *tps_rtc = platform_get_drvdata(pdev); | ||
300 | |||
301 | tps65910_rtc_alarm_irq_enable(&pdev->dev, 0); | 298 | tps65910_rtc_alarm_irq_enable(&pdev->dev, 0); |
302 | 299 | ||
303 | rtc_device_unregister(tps_rtc->rtc); | ||
304 | return 0; | 300 | return 0; |
305 | } | 301 | } |
306 | 302 | ||