leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: rtc-ep93xx: 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:02 -07:00 committed by Linus Torvalds
parent f7cfdea08a
commit 5d65cbfbc8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,8 +153,8 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
pdev->dev.platform_data = ep93xx_rtc; pdev->dev.platform_data = ep93xx_rtc;
platform_set_drvdata(pdev, ep93xx_rtc); platform_set_drvdata(pdev, ep93xx_rtc);
ep93xx_rtc->rtc = rtc_device_register(pdev->name, ep93xx_rtc->rtc = devm_rtc_device_register(&pdev->dev,
&pdev->dev, &ep93xx_rtc_ops, THIS_MODULE); pdev->name, &ep93xx_rtc_ops, THIS_MODULE);
if (IS_ERR(ep93xx_rtc->rtc)) { if (IS_ERR(ep93xx_rtc->rtc)) {
err = PTR_ERR(ep93xx_rtc->rtc); err = PTR_ERR(ep93xx_rtc->rtc);
goto exit; goto exit;
@ -162,12 +162,10 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files); err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
if (err) if (err)
goto fail; goto exit;
return 0; return 0;
fail:
rtc_device_unregister(ep93xx_rtc->rtc);
exit: exit:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
pdev->dev.platform_data = NULL; pdev->dev.platform_data = NULL;
@ -176,11 +174,8 @@ exit:
static int ep93xx_rtc_remove(struct platform_device *pdev) static int ep93xx_rtc_remove(struct platform_device *pdev)
{ {
struct ep93xx_rtc *ep93xx_rtc = platform_get_drvdata(pdev);
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files); sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
rtc_device_unregister(ep93xx_rtc->rtc);
pdev->dev.platform_data = NULL; pdev->dev.platform_data = NULL;
return 0; return 0;