summaryrefslogtreecommitdiff
path: root/include/linux/nvmem-consumer.h
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-06-02 14:05:12 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 17:42:55 +0300
commita6c50912508d80164a5e607993b617be85a46d73 (patch)
treeb67160159aec1e1a31a7ad6e60976e4c2f00b340 /include/linux/nvmem-consumer.h
parentdeb319705e7eb60a870e24f75ff8d6452372e350 (diff)
downloadlinux-a6c50912508d80164a5e607993b617be85a46d73.tar.xz
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: e2a5402ec7c6 ("nvmem: Add nvmem_device based consumer apis.") Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/nvmem-consumer.h')
-rw-r--r--include/linux/nvmem-consumer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
index 9bb77d3ed6e0..c2256d746543 100644
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -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);
}