lkml.org 
[lkml]   [2023]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH 22/37] nvmem: core: provide own priv pointer in post process callback
    Date
    From: Michael Walle <michael@walle.cc>

    It doesn't make any more sense to have a opaque pointer set up by the
    nvmem device. Usually, the layout isn't associated with a particular
    nvmem device. Instead, let the caller who set the post process callback
    provide the priv pointer.

    Signed-off-by: Michael Walle <michael@walle.cc>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    ---
    drivers/nvmem/core.c | 4 +++-
    include/linux/nvmem-provider.h | 5 ++++-
    2 files changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
    index ae59d9cb901c..81ad6a4c4f86 100644
    --- a/drivers/nvmem/core.c
    +++ b/drivers/nvmem/core.c
    @@ -53,6 +53,7 @@ struct nvmem_cell_entry {
    int bit_offset;
    int nbits;
    nvmem_cell_post_process_t read_post_process;
    + void *priv;
    struct device_node *np;
    struct nvmem_device *nvmem;
    struct list_head node;
    @@ -470,6 +471,7 @@ static int nvmem_cell_info_to_nvmem_cell_entry_nodup(struct nvmem_device *nvmem,
    cell->bytes = info->bytes;
    cell->name = info->name;
    cell->read_post_process = info->read_post_process;
    + cell->priv = info->priv;

    cell->bit_offset = info->bit_offset;
    cell->nbits = info->nbits;
    @@ -1550,7 +1552,7 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
    nvmem_shift_read_buffer_in_place(cell, buf);

    if (cell->read_post_process) {
    - rc = cell->read_post_process(nvmem->priv, id, index,
    + rc = cell->read_post_process(cell->priv, id, index,
    cell->offset, buf, cell->bytes);
    if (rc)
    return rc;
    diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
    index d3d7af86a283..0cf9f9490514 100644
    --- a/include/linux/nvmem-provider.h
    +++ b/include/linux/nvmem-provider.h
    @@ -20,7 +20,8 @@ typedef int (*nvmem_reg_write_t)(void *priv, unsigned int offset,
    void *val, size_t bytes);
    /* used for vendor specific post processing of cell data */
    typedef int (*nvmem_cell_post_process_t)(void *priv, const char *id, int index,
    - unsigned int offset, void *buf, size_t bytes);
    + unsigned int offset, void *buf,
    + size_t bytes);

    enum nvmem_type {
    NVMEM_TYPE_UNKNOWN = 0,
    @@ -56,6 +57,7 @@ struct nvmem_keepout {
    * @np: Optional device_node pointer.
    * @read_post_process: Callback for optional post processing of cell data
    * on reads.
    + * @priv: Opaque data passed to the read_post_process hook.
    */
    struct nvmem_cell_info {
    const char *name;
    @@ -65,6 +67,7 @@ struct nvmem_cell_info {
    unsigned int nbits;
    struct device_node *np;
    nvmem_cell_post_process_t read_post_process;
    + void *priv;
    };

    /**
    --
    2.25.1
    \
     
     \ /
      Last update: 2023-03-27 00:10    [W:4.793 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site