|
@@ -538,15 +538,14 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- rtc = rtc_device_register(pdev->name, &pdev->dev, &ds1511_rtc_ops,
|
|
|
- THIS_MODULE);
|
|
|
+ rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &ds1511_rtc_ops,
|
|
|
+ THIS_MODULE);
|
|
|
if (IS_ERR(rtc))
|
|
|
return PTR_ERR(rtc);
|
|
|
pdata->rtc = rtc;
|
|
|
|
|
|
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
|
|
|
- if (ret)
|
|
|
- rtc_device_unregister(pdata->rtc);
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -555,7 +554,6 @@ static int ds1511_rtc_remove(struct platform_device *pdev)
|
|
|
struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
|
|
|
|
|
|
sysfs_remove_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
|
|
|
- rtc_device_unregister(pdata->rtc);
|
|
|
if (pdata->irq > 0) {
|
|
|
/*
|
|
|
* disable the alarm interrupt
|