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

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

diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 75a0e73..481c952 100644 (file)
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -254,13 +254,12 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
                return PTR_ERR(info->rtc);
 
        info->rtc->ops = &m48t86_rtc_ops;
-       info->rtc->nvram_old_abi = true;
 
-       err = rtc_register_device(info->rtc);
+       err = devm_rtc_register_device(info->rtc);
        if (err)
                return err;
 
-       rtc_nvmem_register(info->rtc, &m48t86_nvmem_cfg);
+       devm_rtc_nvmem_register(info->rtc, &m48t86_nvmem_cfg);
 
        /* read battery status */
        reg = m48t86_readb(&pdev->dev, M48T86_D);