Merge tag '5.11-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / drivers / rtc / rtc-ds1742.c

diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 2b949f0..13d45c6 100644 (file)
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -190,14 +190,12 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
                return PTR_ERR(rtc);
 
        rtc->ops = &ds1742_rtc_ops;
-       rtc->nvram_old_abi = true;
 
-       ret = rtc_register_device(rtc);
+       ret = devm_rtc_register_device(rtc);
        if (ret)
                return ret;
 
-       if (rtc_nvmem_register(rtc, &nvmem_cfg))
-               dev_err(&pdev->dev, "Unable to register nvmem\n");
+       devm_rtc_nvmem_register(rtc, &nvmem_cfg);
 
        return 0;
 }