Commit 461e557b authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: nvmem: use devm_nvmem_register()

Use the resource managed variant of nvmem_register().
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent b28cc6ce
...@@ -93,7 +93,7 @@ int rtc_nvmem_register(struct rtc_device *rtc, ...@@ -93,7 +93,7 @@ int rtc_nvmem_register(struct rtc_device *rtc,
nvmem_config->dev = rtc->dev.parent; nvmem_config->dev = rtc->dev.parent;
nvmem_config->owner = rtc->owner; 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)) if (IS_ERR(rtc->nvmem))
return PTR_ERR(rtc->nvmem); return PTR_ERR(rtc->nvmem);
...@@ -107,12 +107,7 @@ EXPORT_SYMBOL_GPL(rtc_nvmem_register); ...@@ -107,12 +107,7 @@ EXPORT_SYMBOL_GPL(rtc_nvmem_register);
void rtc_nvmem_unregister(struct rtc_device *rtc) void rtc_nvmem_unregister(struct rtc_device *rtc)
{ {
if (IS_ERR_OR_NULL(rtc->nvmem))
return;
/* unregister the old ABI */ /* unregister the old ABI */
if (rtc->nvram) if (rtc->nvram)
rtc_nvram_unregister(rtc); rtc_nvram_unregister(rtc);
nvmem_unregister(rtc->nvmem);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment