Patch "nvmem: Declare nvmem_cell_read() consistently" has been added to the 4.4-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-10-04 15:18:07
This is a note to let you know that I've just added the patch titled
nvmem: Declare nvmem_cell_read() consistently
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nvmem-declare-nvmem_cell_read-consistently.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From a6c50912508d80164a5e607993b617be85a46d73 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Thu, 2 Jun 2016 12:05:12 +0100
Subject: nvmem: Declare nvmem_cell_read() consistently
From: Guenter Roeck <linux@roeck-us.net>
commit a6c50912508d80164a5e607993b617be85a46d73 upstream.
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 <redacted>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Srinivas Kandagatla <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
include/linux/nvmem-consumer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h@@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct { } -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); }
Patches currently in stable-queue which might be from linux@roeck-us.net are queue-4.4/hwmon-adt7411-set-bit-3-in-cfg1-register.patch queue-4.4/nvmem-declare-nvmem_cell_read-consistently.patch