diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:31 -0400 |
commit | cc40d642f8f0cd036a105ac0237138fd1812a94f (patch) | |
tree | fdfe7debc0e36e441d6e1d42d124d8c8d6aa3e6b | |
parent | 45e39861057df7b75c4068f85d011ea25d7d8015 (diff) |
rtc: rtc-sun4v: 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-sun4v.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-sun4v.c b/drivers/rtc/rtc-sun4v.c index 7c51c499877b..ce42e5fa9e09 100644 --- a/drivers/rtc/rtc-sun4v.c +++ b/drivers/rtc/rtc-sun4v.c | |||
@@ -81,8 +81,10 @@ static const struct rtc_class_ops sun4v_rtc_ops = { | |||
81 | 81 | ||
82 | static int __init sun4v_rtc_probe(struct platform_device *pdev) | 82 | static int __init sun4v_rtc_probe(struct platform_device *pdev) |
83 | { | 83 | { |
84 | struct rtc_device *rtc = rtc_device_register("sun4v", &pdev->dev, | 84 | struct rtc_device *rtc; |
85 | &sun4v_rtc_ops, THIS_MODULE); | 85 | |
86 | rtc = devm_rtc_device_register(&pdev->dev, "sun4v", | ||
87 | &sun4v_rtc_ops, THIS_MODULE); | ||
86 | if (IS_ERR(rtc)) | 88 | if (IS_ERR(rtc)) |
87 | return PTR_ERR(rtc); | 89 | return PTR_ERR(rtc); |
88 | 90 | ||
@@ -92,9 +94,6 @@ static int __init sun4v_rtc_probe(struct platform_device *pdev) | |||
92 | 94 | ||
93 | static int __exit sun4v_rtc_remove(struct platform_device *pdev) | 95 | static int __exit sun4v_rtc_remove(struct platform_device *pdev) |
94 | { | 96 | { |
95 | struct rtc_device *rtc = platform_get_drvdata(pdev); | ||
96 | |||
97 | rtc_device_unregister(rtc); | ||
98 | return 0; | 97 | return 0; |
99 | } | 98 | } |
100 | 99 | ||