Because nvmem_config is only used and copied at nvmem registration, remove
it from struct rtc_device.

All the rtc drivers using nvmem are now calling rtc_nvmem_register
directly.

Signed-off-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
---
 drivers/rtc/class.c | 2 --
 include/linux/rtc.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 47c4aeed5106..999ed039da0d 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -453,8 +453,6 @@ int __rtc_register_device(struct module *owner, struct 
rtc_device *rtc)
 
        rtc_proc_add_device(rtc);
 
-       rtc_nvmem_register(rtc, rtc->nvmem_config);
-
        rtc->registered = true;
        dev_info(rtc->dev.parent, "registered as %s\n",
                 dev_name(&rtc->dev));
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index fbc92fff7c2e..37b041f72f8d 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -145,7 +145,6 @@ struct rtc_device {
 
        bool registered;
 
-       struct nvmem_config *nvmem_config;
        struct nvmem_device *nvmem;
        /* Old ABI support */
        bool nvram_old_abi;
-- 
2.16.1

Reply via email to