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

rtc: rtc-ds1553: 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:00 -07:00
committed by Linus Torvalds
parent f650e657af
commit c1be915ee0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rtc/rtc-ds1553.c
View File

@@ -326,15 +326,14 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
} }
} }
rtc = rtc_device_register(pdev->name, &pdev->dev, rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&ds1553_rtc_ops, THIS_MODULE); &ds1553_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) if (IS_ERR(rtc))
return PTR_ERR(rtc); return PTR_ERR(rtc);
pdata->rtc = rtc; pdata->rtc = rtc;
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr); ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
if (ret)
rtc_device_unregister(rtc);
return ret; return ret;
} }
@@ -343,7 +342,6 @@ static int ds1553_rtc_remove(struct platform_device *pdev)
struct rtc_plat_data *pdata = platform_get_drvdata(pdev); struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
sysfs_remove_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr); sysfs_remove_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
rtc_device_unregister(pdata->rtc);
if (pdata->irq > 0) if (pdata->irq > 0)
writeb(0, pdata->ioaddr + RTC_INTERRUPTS); writeb(0, pdata->ioaddr + RTC_INTERRUPTS);
return 0; return 0;