Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc: rtc-ds1742: 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>

authored by

Jingoo Han and committed by
Linus Torvalds
f7cfdea0 c1be915e

+2 -6
+2 -6
drivers/rtc/rtc-ds1742.c
··· 208 208 209 209 pdata->last_jiffies = jiffies; 210 210 platform_set_drvdata(pdev, pdata); 211 - rtc = rtc_device_register(pdev->name, &pdev->dev, 211 + rtc = devm_rtc_device_register(&pdev->dev, pdev->name, 212 212 &ds1742_rtc_ops, THIS_MODULE); 213 213 if (IS_ERR(rtc)) 214 214 return PTR_ERR(rtc); 215 215 pdata->rtc = rtc; 216 216 217 217 ret = sysfs_create_bin_file(&pdev->dev.kobj, &pdata->nvram_attr); 218 - if (ret) { 219 - dev_err(&pdev->dev, "creating nvram file in sysfs failed\n"); 220 - rtc_device_unregister(rtc); 221 - } 218 + 222 219 return ret; 223 220 } 224 221 ··· 224 227 struct rtc_plat_data *pdata = platform_get_drvdata(pdev); 225 228 226 229 sysfs_remove_bin_file(&pdev->dev.kobj, &pdata->nvram_attr); 227 - rtc_device_unregister(pdata->rtc); 228 230 return 0; 229 231 } 230 232