lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 207/350] nvmem: core: fix nvmem_cell_write inline function
    Date
    From: Sebastian Reichel <sebastian.reichel@collabora.com>

    [ Upstream commit 9b8303fc6efa724bd6a90656434fbde2cc6ceb2c ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/nvmem-consumer.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
    index 8f8be5b000602..5c17cb7332241 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.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:24    [W:4.263 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site