lkml.org 
[lkml]   [2018]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/13] nvmem: change the signature of nvmem_unregister()
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    This function can no longer fail and there are no more users that check
    it return value. Change it to return void.

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    ---
    drivers/nvmem/core.c | 8 ++------
    include/linux/nvmem-provider.h | 4 ++--
    2 files changed, 4 insertions(+), 8 deletions(-)

    diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
    index 2335b72d4b3e..89b91f73d08a 100644
    --- a/drivers/nvmem/core.c
    +++ b/drivers/nvmem/core.c
    @@ -450,20 +450,16 @@ static void nvmem_device_release(struct kref *kref)
    * nvmem_unregister() - Unregister previously registered nvmem device
    *
    * @nvmem: Pointer to previously registered nvmem device.
    - *
    - * Return: Will be an negative on error or a zero on success.
    */
    -int nvmem_unregister(struct nvmem_device *nvmem)
    +void nvmem_unregister(struct nvmem_device *nvmem)
    {
    kref_put(&nvmem->refcnt, nvmem_device_release);
    -
    - return 0;
    }
    EXPORT_SYMBOL_GPL(nvmem_unregister);

    static void devm_nvmem_release(struct device *dev, void *res)
    {
    - WARN_ON(nvmem_unregister(*(struct nvmem_device **)res));
    + nvmem_unregister(*(struct nvmem_device **)res);
    }

    /**
    diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
    index cc8556e3c825..07ab1ea73520 100644
    --- a/include/linux/nvmem-provider.h
    +++ b/include/linux/nvmem-provider.h
    @@ -67,7 +67,7 @@ struct nvmem_config {
    #if IS_ENABLED(CONFIG_NVMEM)

    struct nvmem_device *nvmem_register(const struct nvmem_config *cfg);
    -int nvmem_unregister(struct nvmem_device *nvmem);
    +void nvmem_unregister(struct nvmem_device *nvmem);

    struct nvmem_device *devm_nvmem_register(struct device *dev,
    const struct nvmem_config *cfg);
    @@ -81,7 +81,7 @@ static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c)
    return ERR_PTR(-ENOSYS);
    }

    -static inline int nvmem_unregister(struct nvmem_device *nvmem)
    +static inline void nvmem_unregister(struct nvmem_device *nvmem)
    {
    return -ENOSYS;
    }
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-09-05 11:59    [W:4.041 / U:1.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site