Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cce9d39 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: nvmem: pass nvmem_config to rtc_nvmem_register() 



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

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 7b21db91

drivers/rtc/class.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc) 


	rtc_proc_add_device(rtc);



	rtc_nvmem_register(rtc);

	rtc_nvmem_register(rtc, rtc->nvmem_config);



	rtc->registered = true;

	dev_info(rtc->dev.parent, "registered as %s\n",

drivers/rtc/nvmem.c

+9 −8
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ rtc_nvram_write(struct file *filp, struct kobject *kobj, 
	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;
@@ -64,7 +64,7 @@ static int rtc_nvram_register(struct rtc_device *rtc) 


	rtc->nvram->read = rtc_nvram_read;

	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,

				    rtc->nvram);
@@ -84,20 +84,21 @@ static void rtc_nvram_unregister(struct rtc_device *rtc) 
/*

 * 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;



	rtc->nvmem_config->dev = &rtc->dev;

	rtc->nvmem_config->owner = rtc->owner;

	rtc->nvmem = nvmem_register(rtc->nvmem_config);

	nvmem_config->dev = &rtc->dev;

	nvmem_config->owner = rtc->owner;

	rtc->nvmem = nvmem_register(nvmem_config);

	if (IS_ERR_OR_NULL(rtc->nvmem))

		return;



	/* Register the 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)

drivers/rtc/rtc-core.h

+4 −2
Original line number Diff line number Diff line
@@ -48,9 +48,11 @@ static inline const struct attribute_group **rtc_get_dev_attribute_groups(void) 
#endif



#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);

#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) {}

#endif