From: Alexandre Belloni Date: Mon, 12 Feb 2018 22:47:28 +0000 (+0100) Subject: rtc: omap: call rtc_nvmem_register() X-Git-Tag: v4.17-rc1~62^2~109 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ce603842c282a68191022aa3361ae18fc50a7f82;p=linux-2.6-block.git rtc: omap: call rtc_nvmem_register() Call rtc_nvmem_register instead of letting the core do it and stop using the nvmem_config member of struct rtc_device. Signed-off-by: Alexandre Belloni --- diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 09ef802d6e54..e53cb27f4118 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -850,7 +850,6 @@ static int omap_rtc_probe(struct platform_device *pdev) rtc->rtc->ops = &omap_rtc_ops; omap_rtc_nvmem_config.priv = rtc; - rtc->rtc->nvmem_config = &omap_rtc_nvmem_config; /* handle periodic and alarm irqs */ ret = devm_request_irq(&pdev->dev, rtc->irq_timer, rtc_irq, 0, @@ -886,6 +885,8 @@ static int omap_rtc_probe(struct platform_device *pdev) if (ret) goto err; + rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config); + return 0; err: