nvmem: core: add nvmem_cell_read_common
PATCH 1/2 nvmem: core: add nvmem_cell_read_common
Now there are nvmem_cell_read_u16 and nvmem_cell_read_u32. They are very similar, let's strip out a common part.
And use nvmem_cell_read_common to simplify their implementation.
--- drivers/nvmem/core.c | 54 ++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 35 deletions(-)
drivers/nvmem/core.c +19 -35
@@ -1071,16 +1071,8 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len) }EXPORT_SYMBOL_GPL (nvmem_cell_write); -/** -* nvmem_cell_read_u16() - Read a cell value as an u16 -* -* @dev: Device that requests the nvmem cell. -* @cell_id: Name of nvmem cell to read. -* @val: pointer to output value. -* -* Return: 0 on success or negative errno. -*/ -int nvmem_cell_read_u16 (struct device *dev,const char *cell_id,u16 *val) +static int nvmem_cell_read_common (struct device *dev,const char *cell_id, +void *val,size_t count) {struct nvmem_cell *cell;void *buf;
@@ -1095,17 +1087,31 @@ int nvmem_cell_read_u16(struct device *dev, const char *cell_id, u16 *val)nvmem_cell_put (cell);return PTR_ERR (buf); } -if (len !=sizeof (*val)) { +if (len != count) {kfree (buf);nvmem_cell_put (cell);return -EINVAL ; } -memcpy (val, buf,sizeof (*val)); +memcpy (val, buf, count);kfree (buf);nvmem_cell_put (cell);return 0 ; } + +/** +* nvmem_cell_read_u16() - Read a cell value as an u16 +* +* @dev: Device that requests the nvmem cell. +* @cell_id: Name of nvmem cell to read. +* @val: pointer to output value. +* +* Return: 0 on success or negative errno. +*/ +int nvmem_cell_read_u16 (struct device *dev,const char *cell_id,u16 *val) +{ +return nvmem_cell_read_common (dev, cell_id, val,sizeof (*val)); +}EXPORT_SYMBOL_GPL (nvmem_cell_read_u16);/**
@@ -1119,29 +1125,7 @@ EXPORT_SYMBOL_GPL(nvmem_cell_read_u16);*/ int nvmem_cell_read_u32 (struct device *dev,const char *cell_id,u32 *val) { -struct nvmem_cell *cell; -void *buf; -size_t len; - - cell =nvmem_cell_get (dev, cell_id); -if (IS_ERR (cell)) -return PTR_ERR (cell); - - buf =nvmem_cell_read (cell, &len); -if (IS_ERR (buf)) { -nvmem_cell_put (cell); -return PTR_ERR (buf); - } -if (len !=sizeof (*val)) { -kfree (buf); -nvmem_cell_put (cell); -return -EINVAL ; - } -memcpy (val, buf,sizeof (*val)); - -kfree (buf); -nvmem_cell_put (cell); -return 0 ; +return nvmem_cell_read_common (dev, cell_id, val,sizeof (*val)); }EXPORT_SYMBOL_GPL (nvmem_cell_read_u32);
Signature · 1 line
2.17.1
PATCH 2/2 nvmem: core: add nvmem_cell_read_u64
Add nvmem_cell_read_u64() helper to ease read of an u64 value on consumer side. This helper is useful on some sunxi platform that has 64 bits data cells stored in no volatile memory.
--- drivers/nvmem/core.c | 15 +++++++++++++++ include/linux/nvmem-consumer.h | 7 +++++++ 2 files changed, 22 insertions(+)
drivers/nvmem/core.c +15 -0
@@ -1129,6 +1129,21 @@ int nvmem_cell_read_u32(struct device *dev, const char *cell_id, u32 *val) }EXPORT_SYMBOL_GPL (nvmem_cell_read_u32); +/** +* nvmem_cell_read_u64() - Read a cell value as an u64 +* +* @dev: Device that requests the nvmem cell. +* @cell_id: Name of nvmem cell to read. +* @val: pointer to output value. +* +* Return: 0 on success or negative errno. +*/ +int nvmem_cell_read_u64 (struct device *dev,const char *cell_id,u64 *val) +{ +return nvmem_cell_read_common (dev, cell_id, val,sizeof (*val)); +} +EXPORT_SYMBOL_GPL (nvmem_cell_read_u64); +/** * nvmem_device_cell_read() - Read a given nvmem device and cell *
include/linux/nvmem-consumer.h +7 -0
@@ -63,6 +63,7 @@ void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len);int nvmem_cell_write (struct nvmem_cell *cell,void *buf,size_t len);int nvmem_cell_read_u16 (struct device *dev,const char *cell_id,u16 *val);int nvmem_cell_read_u32 (struct device *dev,const char *cell_id,u32 *val); +int nvmem_cell_read_u64 (struct device *dev,const char *cell_id,u64 *val);/* direct nvmem device read/write interface */ struct nvmem_device *nvmem_device_get (struct device *dev,const char *name);
@@ -138,6 +139,12 @@ static inline int nvmem_cell_read_u32(struct device *dev,return -EOPNOTSUPP ; } +static inline int nvmem_cell_read_u64 (struct device *dev, +const char *cell_id,u64 *val) +{ +return -EOPNOTSUPP ; +} +static inline struct nvmem_device *nvmem_device_get (struct device *dev,const char *name) {
Signature · 1 line
2.17.1
ping...
Quoted 102 lines · Yangtao Li
Now there are
nvmem_cell_read_u16andnvmem_cell_read_u32. They are very similar, let's strip out a common part.And use
nvmem_cell_read_commonto simplify their implementation.Signed-off-by Yangtao Li <[email protected]>--- drivers/nvmem/core.c | 54 ++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 35 deletions(-)drivers/nvmem/core.c +19
-36@@ -1071,16 +1071,8 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len) }EXPORT_SYMBOL_GPL (nvmem_cell_write); -/** -* nvmem_cell_read_u16() - Read a cell value as an u16 -* -* @dev: Device that requests the nvmem cell. -* @cell_id: Name of nvmem cell to read. -* @val: pointer to output value. -* -* Return: 0 on success or negative errno. -*/ -int nvmem_cell_read_u16 (struct device *dev,const char *cell_id,u16 *val) +static int nvmem_cell_read_common (struct device *dev,const char *cell_id, +void *val,size_t count) {struct nvmem_cell *cell;void *buf;@@ -1095,17 +1087,31 @@ int nvmem_cell_read_u16(struct device *dev, const char *cell_id, u16 *val)nvmem_cell_put (cell);return PTR_ERR (buf); } -if (len !=sizeof (*val)) { +if (len != count) {kfree (buf);nvmem_cell_put (cell);return -EINVAL ; } -memcpy (val, buf,sizeof (*val)); +memcpy (val, buf, count);kfree (buf);nvmem_cell_put (cell);return 0 ; } + +/** +* nvmem_cell_read_u16() - Read a cell value as an u16 +* +* @dev: Device that requests the nvmem cell. +* @cell_id: Name of nvmem cell to read. +* @val: pointer to output value. +* +* Return: 0 on success or negative errno. +*/ +int nvmem_cell_read_u16 (struct device *dev,const char *cell_id,u16 *val) +{ +return nvmem_cell_read_common (dev, cell_id, val,sizeof (*val)); +}EXPORT_SYMBOL_GPL (nvmem_cell_read_u16);/** @@ -1119,29 +1125,7 @@ EXPORT_SYMBOL_GPL(nvmem_cell_read_u16);*/ int nvmem_cell_read_u32 (struct device *dev,const char *cell_id,u32 *val) { -struct nvmem_cell *cell; -void *buf; -size_t len; - - cell =nvmem_cell_get (dev, cell_id); -if (IS_ERR (cell)) -return PTR_ERR (cell); - - buf =nvmem_cell_read (cell, &len); -if (IS_ERR (buf)) { -nvmem_cell_put (cell); -return PTR_ERR (buf); - } -if (len !=sizeof (*val)) { -kfree (buf); -nvmem_cell_put (cell); -return -EINVAL ; - } -memcpy (val, buf,sizeof (*val)); - -kfree (buf); -nvmem_cell_put (cell); -return 0 ; +return nvmem_cell_read_common (dev, cell_id, val,sizeof (*val)); }EXPORT_SYMBOL_GPL (nvmem_cell_read_u32); --2.17.1
drivers/nvmem/core.c
Quoted 11 lines · Yangtao Li
Now there are
nvmem_cell_read_u16andnvmem_cell_read_u32. They are very similar, let's strip out a common part.And use
nvmem_cell_read_commonto simplify their implementation.Signed-off-by Yangtao Li <[email protected]>--- drivers/nvmem/core.c | 54 ++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 35 deletions(-)drivers/nvmem/core.c +0
-0
Applied both,
thanks,
srini