openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200310132257.23358-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yangtao Li 2020-03-10 13:22:45 +00:00 committed by Greg Kroah-Hartman
parent c3f4af8b31
commit 6bb317ce75
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/nvmem/core.c
View File

@ -1088,16 +1088,8 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len)
} }
EXPORT_SYMBOL_GPL(nvmem_cell_write); EXPORT_SYMBOL_GPL(nvmem_cell_write);
/** static int nvmem_cell_read_common(struct device *dev, const char *cell_id,
* nvmem_cell_read_u16() - Read a cell value as an u16 void *val, size_t count)
*
* @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)
{ {
struct nvmem_cell *cell; struct nvmem_cell *cell;
void *buf; void *buf;
@ -1112,17 +1104,31 @@ int nvmem_cell_read_u16(struct device *dev, const char *cell_id, u16 *val)
nvmem_cell_put(cell); nvmem_cell_put(cell);
return PTR_ERR(buf); return PTR_ERR(buf);
} }
if (len != sizeof(*val)) { if (len != count) {
kfree(buf); kfree(buf);
nvmem_cell_put(cell); nvmem_cell_put(cell);
return -EINVAL; return -EINVAL;
} }
memcpy(val, buf, sizeof(*val)); memcpy(val, buf, count);
kfree(buf); kfree(buf);
nvmem_cell_put(cell); nvmem_cell_put(cell);
return 0; 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); EXPORT_SYMBOL_GPL(nvmem_cell_read_u16);
/** /**
@ -1136,29 +1142,7 @@ EXPORT_SYMBOL_GPL(nvmem_cell_read_u16);
*/ */
int nvmem_cell_read_u32(struct device *dev, const char *cell_id, u32 *val) int nvmem_cell_read_u32(struct device *dev, const char *cell_id, u32 *val)
{ {
struct nvmem_cell *cell; return nvmem_cell_read_common(dev, cell_id, val, sizeof(*val));
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;
} }
EXPORT_SYMBOL_GPL(nvmem_cell_read_u32); EXPORT_SYMBOL_GPL(nvmem_cell_read_u32);