mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: nvmem: pass nvmem_config to rtc_nvmem_register()

Browse Source 
To be able to remove nvmem_config from struct rtc_device, pass it as a
parameter to rtc_nvmem_register.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Alexandre Belloni
2018-02-12 23:47:16 +01:00
parent 7b21db9184
commit 4cce9d3988
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rtc/class.c
View File

@@ -453,7 +453,7 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
rtc_proc_add_device(rtc); rtc_proc_add_device(rtc);
rtc_nvmem_register(rtc); rtc_nvmem_register(rtc, rtc->nvmem_config);
rtc->registered = true; rtc->registered = true;
dev_info(rtc->dev.parent, "registered as %s\n", dev_info(rtc->dev.parent, "registered as %s\n",

17
drivers/rtc/nvmem.c
View File

@@ -46,7 +46,7 @@ rtc_nvram_write(struct file *filp, struct kobject *kobj,
return nvmem_device_write(rtc->nvmem, off, count, buf); return nvmem_device_write(rtc->nvmem, off, count, buf);
} }
static int rtc_nvram_register(struct rtc_device *rtc) static int rtc_nvram_register(struct rtc_device *rtc, size_t size)
{ {
int err; int err;
@@ -64,7 +64,7 @@ static int rtc_nvram_register(struct rtc_device *rtc)
rtc->nvram->read = rtc_nvram_read; rtc->nvram->read = rtc_nvram_read;
rtc->nvram->write = rtc_nvram_write; rtc->nvram->write = rtc_nvram_write;
rtc->nvram->size = rtc->nvmem_config->size; rtc->nvram->size = size;
err = sysfs_create_bin_file(&rtc->dev.parent->kobj, err = sysfs_create_bin_file(&rtc->dev.parent->kobj,
rtc->nvram); rtc->nvram);
@@ -84,20 +84,21 @@ static void rtc_nvram_unregister(struct rtc_device *rtc)
/* /*
* New ABI, uses nvmem * New ABI, uses nvmem
*/ */
void rtc_nvmem_register(struct rtc_device *rtc) void rtc_nvmem_register(struct rtc_device *rtc,
struct nvmem_config *nvmem_config)
{ {
if (!rtc->nvmem_config) if (!nvmem_config)
return; return;
rtc->nvmem_config->dev = &rtc->dev; nvmem_config->dev = &rtc->dev;
rtc->nvmem_config->owner = rtc->owner; nvmem_config->owner = rtc->owner;
rtc->nvmem = nvmem_register(rtc->nvmem_config); rtc->nvmem = nvmem_register(nvmem_config);
if (IS_ERR_OR_NULL(rtc->nvmem)) if (IS_ERR_OR_NULL(rtc->nvmem))
return; return;
/* Register the old ABI */ /* Register the old ABI */
if (rtc->nvram_old_abi) if (rtc->nvram_old_abi)
rtc_nvram_register(rtc); rtc_nvram_register(rtc, nvmem_config->size);
} }
void rtc_nvmem_unregister(struct rtc_device *rtc) void rtc_nvmem_unregister(struct rtc_device *rtc)

6
drivers/rtc/rtc-core.h
View File

@@ -48,9 +48,11 @@ static inline const struct attribute_group **rtc_get_dev_attribute_groups(void)
#endif #endif
#ifdef CONFIG_RTC_NVMEM #ifdef CONFIG_RTC_NVMEM
void rtc_nvmem_register(struct rtc_device *rtc); void rtc_nvmem_register(struct rtc_device *rtc,
struct nvmem_config *nvmem_config);
void rtc_nvmem_unregister(struct rtc_device *rtc); void rtc_nvmem_unregister(struct rtc_device *rtc);
#else #else
static inline void rtc_nvmem_register(struct rtc_device *rtc) {} static inline void rtc_nvmem_register(struct rtc_device *rtc,
struct nvmem_config *nvmem_config) {}
static inline void rtc_nvmem_unregister(struct rtc_device *rtc) {} static inline void rtc_nvmem_unregister(struct rtc_device *rtc) {}
#endif #endif