diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:18:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:24 -0400 |
commit | e3c8966858cc71a5acb9084307ce925ea6be7f1d (patch) | |
tree | 4bcc49cc46c98eb2247901ffeccf12c9b0ce08ca /drivers/rtc/rtc-88pm80x.c | |
parent | 80f1def424933ee2538cbc11a944d815d6691453 (diff) |
rtc: rtc-88pm80x: 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-88pm80x.c')
-rw-r--r-- | drivers/rtc/rtc-88pm80x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c index 63b17ebe90e8..76f9505ff7c5 100644 --- a/drivers/rtc/rtc-88pm80x.c +++ b/drivers/rtc/rtc-88pm80x.c | |||
@@ -312,7 +312,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev) | |||
312 | } | 312 | } |
313 | rtc_tm_to_time(&tm, &ticks); | 313 | rtc_tm_to_time(&tm, &ticks); |
314 | 314 | ||
315 | info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev, | 315 | info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm80x-rtc", |
316 | &pm80x_rtc_ops, THIS_MODULE); | 316 | &pm80x_rtc_ops, THIS_MODULE); |
317 | if (IS_ERR(info->rtc_dev)) { | 317 | if (IS_ERR(info->rtc_dev)) { |
318 | ret = PTR_ERR(info->rtc_dev); | 318 | ret = PTR_ERR(info->rtc_dev); |
@@ -346,7 +346,6 @@ static int pm80x_rtc_remove(struct platform_device *pdev) | |||
346 | { | 346 | { |
347 | struct pm80x_rtc_info *info = platform_get_drvdata(pdev); | 347 | struct pm80x_rtc_info *info = platform_get_drvdata(pdev); |
348 | platform_set_drvdata(pdev, NULL); | 348 | platform_set_drvdata(pdev, NULL); |
349 | rtc_device_unregister(info->rtc_dev); | ||
350 | pm80x_free_irq(info->chip, info->irq, info); | 349 | pm80x_free_irq(info->chip, info->irq, info); |
351 | return 0; | 350 | return 0; |
352 | } | 351 | } |