aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 19:19:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 21:28:27 -0400
commitfaa43af9bc96a78b1fcd8067c7d9e3ebd044087e (patch)
tree43cd8d5dd3afa4272350ca958552570da39a3dd6
parent97868b3225b74e9982c70717e3174a13bd9cc765 (diff)
rtc: rtc-tps80031: 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-tps80031.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-tps80031.c b/drivers/rtc/rtc-tps80031.c
index 9aaf8aaebae9..dc62d5fa2a29 100644
--- a/drivers/rtc/rtc-tps80031.c
+++ b/drivers/rtc/rtc-tps80031.c
@@ -277,7 +277,7 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
277 return ret; 277 return ret;
278 } 278 }
279 279
280 rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, 280 rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
281 &tps80031_rtc_ops, THIS_MODULE); 281 &tps80031_rtc_ops, THIS_MODULE);
282 if (IS_ERR(rtc->rtc)) { 282 if (IS_ERR(rtc->rtc)) {
283 ret = PTR_ERR(rtc->rtc); 283 ret = PTR_ERR(rtc->rtc);
@@ -292,7 +292,6 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
292 if (ret < 0) { 292 if (ret < 0) {
293 dev_err(&pdev->dev, "request IRQ:%d failed, err = %d\n", 293 dev_err(&pdev->dev, "request IRQ:%d failed, err = %d\n",
294 rtc->irq, ret); 294 rtc->irq, ret);
295 rtc_device_unregister(rtc->rtc);
296 return ret; 295 return ret;
297 } 296 }
298 device_set_wakeup_capable(&pdev->dev, 1); 297 device_set_wakeup_capable(&pdev->dev, 1);
@@ -301,9 +300,6 @@ static int tps80031_rtc_probe(struct platform_device *pdev)
301 300
302static int tps80031_rtc_remove(struct platform_device *pdev) 301static int tps80031_rtc_remove(struct platform_device *pdev)
303{ 302{
304 struct tps80031_rtc *rtc = platform_get_drvdata(pdev);
305
306 rtc_device_unregister(rtc->rtc);
307 return 0; 303 return 0;
308} 304}
309 305