summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-generic.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 16:19:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:30 -0700
commit360fe134e2808fee04b73406424295d18d09ee85 (patch)
treea020acf84e97faf92c74761dd1c857d6ba2b6c67 /drivers/rtc/rtc-generic.c
parent019b21d07a91e41c2f0dbc8d2c2c7afee6ba4994 (diff)
downloadlinux-360fe134e2808fee04b73406424295d18d09ee85.tar.bz2
rtc: rtc-generic: 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-generic.c')
-rw-r--r--drivers/rtc/rtc-generic.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 0bf4530e18b0..06279ce6bff2 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -38,8 +38,8 @@ static int __init generic_rtc_probe(struct platform_device *dev)
{
struct rtc_device *rtc;
- rtc = rtc_device_register("rtc-generic", &dev->dev, &generic_rtc_ops,
- THIS_MODULE);
+ rtc = devm_rtc_device_register(&dev->dev, "rtc-generic",
+ &generic_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc))
return PTR_ERR(rtc);
@@ -50,10 +50,6 @@ static int __init generic_rtc_probe(struct platform_device *dev)
static int __exit generic_rtc_remove(struct platform_device *dev)
{
- struct rtc_device *rtc = platform_get_drvdata(dev);
-
- rtc_device_unregister(rtc);
-
return 0;
}