Merge tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-ds1742.c

diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 609c870e2cc5b88cb243255e651aed4ec6d1b253..eccdc62ae1c0fbf470a8440917d6159022ee2af5 100644 (file)
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -208,17 +208,14 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
 
        pdata->last_jiffies = jiffies;
        platform_set_drvdata(pdev, pdata);
-       rtc = rtc_device_register(pdev->name, &pdev->dev,
+       rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                  &ds1742_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
        pdata->rtc = rtc;
 
        ret = sysfs_create_bin_file(&pdev->dev.kobj, &pdata->nvram_attr);
-       if (ret) {
-               dev_err(&pdev->dev, "creating nvram file in sysfs failed\n");
-               rtc_device_unregister(rtc);
-       }
+
        return ret;
 }
 
@@ -227,7 +224,6 @@ static int ds1742_rtc_remove(struct platform_device *pdev)
        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
        sysfs_remove_bin_file(&pdev->dev.kobj, &pdata->nvram_attr);
-       rtc_device_unregister(pdata->rtc);
        return 0;
 }