Merge tag 'drm-intel-gt-next-2021-01-14' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-block.git] / drivers / rtc / rtc-ds1553.c

diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index cdf5e05b9489aca2a701e9fad9e5206a5176f336..dbff5b621ef5cc2ce6c09cc62a24104fa329e092 100644 (file)
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -294,9 +294,8 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
                return PTR_ERR(pdata->rtc);
 
        pdata->rtc->ops = &ds1553_rtc_ops;
-       pdata->rtc->nvram_old_abi = true;
 
-       ret = rtc_register_device(pdata->rtc);
+       ret = devm_rtc_register_device(pdata->rtc);
        if (ret)
                return ret;
 
@@ -310,8 +309,7 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
                }
        }
 
-       if (rtc_nvmem_register(pdata->rtc, &nvmem_cfg))
-               dev_err(&pdev->dev, "unable to register nvmem\n");
+       devm_rtc_nvmem_register(pdata->rtc, &nvmem_cfg);
 
        return 0;
 }