forked from Minki/linux
rtc: rtc-ds1553: 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:
parent
f650e657af
commit
c1be915ee0
@ -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);
|
||||
if (IS_ERR(rtc))
|
||||
return PTR_ERR(rtc);
|
||||
pdata->rtc = rtc;
|
||||
|
||||
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
|
||||
if (ret)
|
||||
rtc_device_unregister(rtc);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -343,7 +342,6 @@ static int ds1553_rtc_remove(struct platform_device *pdev)
|
||||
struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
|
||||
|
||||
sysfs_remove_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
|
||||
rtc_device_unregister(pdata->rtc);
|
||||
if (pdata->irq > 0)
|
||||
writeb(0, pdata->ioaddr + RTC_INTERRUPTS);
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user