nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

rtc: nvmem: use devm_nvmem_register()

Browse source 
Use the resource managed variant of nvmem_register().

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Alexandre Belloni 2018-11-10 21:29:02 +01:00
parent b28cc6cec3
commit 461e557b97
1 changed files with 1 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/rtc/nvmem.c
View file

@ -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);
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);
} }