Constify the nvmem_*_write() functions as the write functions shouldn't alter the buffer content. Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx> --- drivers/nvmem/core.c | 10 +++++----- include/linux/nvmem-consumer.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index b4a29e4b67f3..7d795d5873dc 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -794,8 +794,8 @@ void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) } EXPORT_SYMBOL_GPL(nvmem_cell_read); -static inline void *nvmem_cell_prepare_write_buffer(struct nvmem_cell_entry *cell, - u8 *_buf, int len) +static inline const void *nvmem_cell_prepare_write_buffer(struct nvmem_cell_entry *cell, + const u8 *_buf, int len) { struct nvmem_device *nvmem = cell->nvmem; int i, rc, nbits, bit_offset = cell->bit_offset; @@ -846,7 +846,7 @@ static inline void *nvmem_cell_prepare_write_buffer(struct nvmem_cell_entry *cel return buf; } -static int __nvmem_cell_entry_write(struct nvmem_cell_entry *cell, void *buf, size_t len) +static int __nvmem_cell_entry_write(struct nvmem_cell_entry *cell, const void *buf, size_t len) { struct nvmem_device *nvmem = cell->nvmem; int rc; @@ -890,7 +890,7 @@ static int __nvmem_cell_entry_write(struct nvmem_cell_entry *cell, void *buf, si * * Return: length of bytes written or negative on failure. */ -int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len) +int nvmem_cell_write(struct nvmem_cell *cell, const void *buf, size_t len) { return __nvmem_cell_entry_write(cell->entry, buf, len); } @@ -938,7 +938,7 @@ EXPORT_SYMBOL_GPL(nvmem_device_cell_read); * Return: length of bytes written or negative error code on failure. * */ int nvmem_device_cell_write(struct nvmem_device *nvmem, - struct nvmem_cell_info *info, void *buf) + struct nvmem_cell_info *info, const void *buf) { struct nvmem_cell_entry cell; int rc; diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index 54643b792aed..478f469c3560 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -30,7 +30,7 @@ void *nvmem_cell_get_and_read(struct device_node *np, const char *cell_name, int nvmem_cell_read_variable_le_u32(struct device *dev, const char *cell_id, u32 *val); -int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len); +int nvmem_cell_write(struct nvmem_cell *cell, const void *buf, size_t len); /* direct nvmem device read/write interface */ struct nvmem_device *nvmem_device_get(struct device *dev, const char *name); @@ -42,7 +42,7 @@ int nvmem_device_write(struct nvmem_device *nvmem, unsigned int offset, ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem, struct nvmem_cell_info *info, void *buf); int nvmem_device_cell_write(struct nvmem_device *nvmem, - struct nvmem_cell_info *info, void *buf); + struct nvmem_cell_info *info, const void *buf); void nvmem_devices_print(void); @@ -78,7 +78,7 @@ static inline int nvmem_cell_read_variable_le_u32(struct device *dev, } static inline int nvmem_cell_write(struct nvmem_cell *cell, - void *buf, size_t len) + const void *buf, size_t len) { return -EOPNOTSUPP; } @@ -102,7 +102,7 @@ static inline ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem, static inline int nvmem_device_cell_write(struct nvmem_device *nvmem, struct nvmem_cell_info *info, - void *buf) + const void *buf) { return -EOPNOTSUPP; } -- 2.39.2