diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 16:19:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:28:30 -0700 |
| commit | d5b6bb0a93c9a363763aa6124461f1fa82d5278d (patch) | |
| tree | 3853dd96cef40300e43cd5efa8a5793bc543152a | |
| parent | fb320d0a5c037106aa6835a59dc71c6c2eb9c235 (diff) | |
| download | linux-3.10-d5b6bb0a93c9a363763aa6124461f1fa82d5278d.tar.gz linux-3.10-d5b6bb0a93c9a363763aa6124461f1fa82d5278d.tar.bz2 linux-3.10-d5b6bb0a93c9a363763aa6124461f1fa82d5278d.zip | |
rtc: rtc-m48t86: 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-m48t86.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c index 2ffbcacd243..33a91c48453 100644 --- a/drivers/rtc/rtc-m48t86.c +++ b/drivers/rtc/rtc-m48t86.c @@ -148,8 +148,10 @@ static int m48t86_rtc_probe(struct platform_device *dev) { unsigned char reg; struct m48t86_ops *ops = dev->dev.platform_data; - struct rtc_device *rtc = rtc_device_register("m48t86", - &dev->dev, &m48t86_rtc_ops, THIS_MODULE); + struct rtc_device *rtc; + + rtc = devm_rtc_device_register(&dev->dev, "m48t86", + &m48t86_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); @@ -166,11 +168,6 @@ static int m48t86_rtc_probe(struct platform_device *dev) static int m48t86_rtc_remove(struct platform_device *dev) { - struct rtc_device *rtc = platform_get_drvdata(dev); - - if (rtc) - rtc_device_unregister(rtc); - platform_set_drvdata(dev, NULL); return 0; |