1 files changed, 12 insertions, 13 deletions

diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index d9aea9b6d9cd..a9533535c3b7 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -100,7 +100,7 @@ static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm)
                 if (m48t86_readb(dev, M48T86_HOUR) & 0x80)
                         tm->tm_hour += 12;
 
-        return rtc_valid_tm(tm);
+        return 0;
 }
 
 static int m48t86_rtc_set_time(struct device *dev, struct rtc_time *tm)
@@ -218,21 +218,21 @@ static bool m48t86_verify_chip(struct platform_device *pdev)
         return false;
 }
 
-static struct nvmem_config m48t86_nvmem_cfg = {
-        .name = "m48t86_nvram",
-        .word_size = 1,
-        .stride = 1,
-        .size = M48T86_NVRAM_LEN,
-        .reg_read = m48t86_nvram_read,
-        .reg_write = m48t86_nvram_write,
-};
-
 static int m48t86_rtc_probe(struct platform_device *pdev)
 {
         struct m48t86_rtc_info *info;
         struct resource *res;
         unsigned char reg;
         int err;
+        struct nvmem_config m48t86_nvmem_cfg = {
+                .name = "m48t86_nvram",
+                .word_size = 1,
+                .stride = 1,
+                .size = M48T86_NVRAM_LEN,
+                .reg_read = m48t86_nvram_read,
+                .reg_write = m48t86_nvram_write,
+                .priv = &pdev->dev,
+        };
 
         info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
         if (!info)
@@ -264,15 +264,14 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
                 return PTR_ERR(info->rtc);
 
         info->rtc->ops = &m48t86_rtc_ops;
-
-        m48t86_nvmem_cfg.priv = &pdev->dev;
-        info->rtc->nvmem_config = &m48t86_nvmem_cfg;
         info->rtc->nvram_old_abi = true;
 
         err = rtc_register_device(info->rtc);
         if (err)
                 return err;
 
+        rtc_nvmem_register(info->rtc, &m48t86_nvmem_cfg);
+
         /* read battery status */
         reg = m48t86_readb(&pdev->dev, M48T86_D);
         dev_info(&pdev->dev, "battery %s\n",