rtc: nvmem: use devm_nvmem_register()
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Sat, 10 Nov 2018 20:29:02 +0000 (21:29 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 22 Nov 2018 17:10:04 +0000 (18:10 +0100)
Use the resource managed variant of nvmem_register().

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/nvmem.c

index 36ab183..2a7220d 100644 (file)
@@ -93,7 +93,7 @@ int rtc_nvmem_register(struct rtc_device *rtc,
 
        nvmem_config->dev = rtc->dev.parent;
        nvmem_config->owner = rtc->owner;
-       rtc->nvmem = nvmem_register(nvmem_config);
+       rtc->nvmem = devm_nvmem_register(rtc->dev.parent, nvmem_config);
        if (IS_ERR(rtc->nvmem))
                return PTR_ERR(rtc->nvmem);
 
@@ -107,12 +107,7 @@ EXPORT_SYMBOL_GPL(rtc_nvmem_register);
 
 void rtc_nvmem_unregister(struct rtc_device *rtc)
 {
-       if (IS_ERR_OR_NULL(rtc->nvmem))
-               return;
-
        /* unregister the old ABI */
        if (rtc->nvram)
                rtc_nvram_unregister(rtc);
-
-       nvmem_unregister(rtc->nvmem);
 }