UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtc: rtc-max8997: 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>
This commit is contained in:
Jingoo Han 2013-04-29 16:19:07 -07:00 committed by Linus Torvalds
parent ac4e7d49e9
commit 4ce903cc91
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/rtc/rtc-max8997.c
View File

@ -479,8 +479,8 @@ static int max8997_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
info->rtc_dev = rtc_device_register("max8997-rtc", &pdev->dev, info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8997-rtc",
&max8997_rtc_ops, THIS_MODULE); &max8997_rtc_ops, THIS_MODULE);
if (IS_ERR(info->rtc_dev)) { if (IS_ERR(info->rtc_dev)) {
ret = PTR_ERR(info->rtc_dev); ret = PTR_ERR(info->rtc_dev);
@ -507,17 +507,11 @@ static int max8997_rtc_probe(struct platform_device *pdev)
return ret; return ret;
err_out: err_out:
rtc_device_unregister(info->rtc_dev);
return ret; return ret;
} }
static int max8997_rtc_remove(struct platform_device *pdev) static int max8997_rtc_remove(struct platform_device *pdev)
{ {
struct max8997_rtc_info *info = platform_get_drvdata(pdev);
if (info)
rtc_device_unregister(info->rtc_dev);
return 0; return 0;
} }