| From 208201a2f724241f64b5d7ea382f15508ec56ec6 Mon Sep 17 00:00:00 2001 |
| From: Sebastian Reichel <sebastian.reichel@collabora.com> |
| Date: Tue, 29 Oct 2019 11:42:31 +0000 |
| Subject: [PATCH] nvmem: core: fix nvmem_cell_write inline function |
| |
| commit 9b8303fc6efa724bd6a90656434fbde2cc6ceb2c upstream. |
| |
| nvmem_cell_write's buf argument uses different types based on |
| the configuration of CONFIG_NVMEM. The function prototype for |
| enabled NVMEM uses 'void *' type, but the static dummy function |
| for disabled NVMEM uses 'const char *' instead. Fix the different |
| behaviour by always expecting a 'void *' typed buf argument. |
| |
| Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface") |
| Reported-by: kbuild test robot <lkp@intel.com> |
| Cc: Han Nandor <nandor.han@vaisala.com> |
| Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> |
| Reviewed-By: Han Nandor <nandor.han@vaisala.com> |
| Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| Link: https://lore.kernel.org/r/20191029114240.14905-2-srinivas.kandagatla@linaro.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h |
| index 8f8be5b00060..5c17cb733224 100644 |
| --- a/include/linux/nvmem-consumer.h |
| +++ b/include/linux/nvmem-consumer.h |
| @@ -118,7 +118,7 @@ static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) |
| } |
| |
| static inline int nvmem_cell_write(struct nvmem_cell *cell, |
| - const char *buf, size_t len) |
| + void *buf, size_t len) |
| { |
| return -EOPNOTSUPP; |
| } |
| -- |
| 2.7.4 |
| |
