Commit a6c50912 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

nvmem: Declare nvmem_cell_read() consistently

nvmem_cell_read() is declared as void * if CONFIG_NVMEM is enabled, and
as char * otherwise. This can result in a build warning if CONFIG_NVMEM
is not enabled and a caller asigns the result to a type other than char *
without using a typecast. Use a consistent declaration to avoid the
problem.

Fixes: e2a5402e ("nvmem: Add nvmem_device based consumer apis.")
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent deb31970
...@@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell) ...@@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell)
{ {
} }
static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
{ {
return ERR_PTR(-ENOSYS); return ERR_PTR(-ENOSYS);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment