lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtc: rtc-m48t86: use devm_rtc_device_register()

Browse Source 
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>
This commit is contained in:
Jingoo Han
2013-04-29 16:19:42 -07:00
committed by Linus Torvalds
parent fb320d0a5c
commit d5b6bb0a93
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/rtc-m48t86.c
View File

@@ -148,8 +148,10 @@ static int m48t86_rtc_probe(struct platform_device *dev)
{ {
unsigned char reg; unsigned char reg;
struct m48t86_ops *ops = dev->dev.platform_data; struct m48t86_ops *ops = dev->dev.platform_data;
struct rtc_device *rtc = rtc_device_register("m48t86", struct rtc_device *rtc;
&dev->dev, &m48t86_rtc_ops, THIS_MODULE);
rtc = devm_rtc_device_register(&dev->dev, "m48t86",
&m48t86_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) if (IS_ERR(rtc))
return PTR_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) 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); platform_set_drvdata(dev, NULL);
return 0; return 0;