diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:31 -0400 |
commit | 45e39861057df7b75c4068f85d011ea25d7d8015 (patch) | |
tree | 0d0d073b1040a90ad4ffff2e9b7750d95bdce2f8 /drivers/rtc/rtc-starfire.c | |
parent | 7c1385b06d12783ec5e6463bf4d6414390858968 (diff) |
rtc: rtc-starfire: 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-starfire.c')
-rw-r--r-- | drivers/rtc/rtc-starfire.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c index db7d0765aabd..987b5ec0ae56 100644 --- a/drivers/rtc/rtc-starfire.c +++ b/drivers/rtc/rtc-starfire.c | |||
@@ -39,8 +39,10 @@ static const struct rtc_class_ops starfire_rtc_ops = { | |||
39 | 39 | ||
40 | static int __init starfire_rtc_probe(struct platform_device *pdev) | 40 | static int __init starfire_rtc_probe(struct platform_device *pdev) |
41 | { | 41 | { |
42 | struct rtc_device *rtc = rtc_device_register("starfire", &pdev->dev, | 42 | struct rtc_device *rtc; |
43 | &starfire_rtc_ops, THIS_MODULE); | 43 | |
44 | rtc = devm_rtc_device_register(&pdev->dev, "starfire", | ||
45 | &starfire_rtc_ops, THIS_MODULE); | ||
44 | if (IS_ERR(rtc)) | 46 | if (IS_ERR(rtc)) |
45 | return PTR_ERR(rtc); | 47 | return PTR_ERR(rtc); |
46 | 48 | ||
@@ -51,10 +53,6 @@ static int __init starfire_rtc_probe(struct platform_device *pdev) | |||
51 | 53 | ||
52 | static int __exit starfire_rtc_remove(struct platform_device *pdev) | 54 | static int __exit starfire_rtc_remove(struct platform_device *pdev) |
53 | { | 55 | { |
54 | struct rtc_device *rtc = platform_get_drvdata(pdev); | ||
55 | |||
56 | rtc_device_unregister(rtc); | ||
57 | |||
58 | return 0; | 56 | return 0; |
59 | } | 57 | } |
60 | 58 | ||