nvmem: core: Use devm_add_action_or_reset()

Slightly simplify the devm_nvmem_register() by using the
devm_add_action_or_reset().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220220151527.17216-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 1a70b3bdb71d56009aa2487ee75b565958dd895e..68db7d3303ac499b3617ac870e358f9c0783be43 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -907,9 +907,9 @@ void nvmem_unregister(struct nvmem_device *nvmem)
 }
 EXPORT_SYMBOL_GPL(nvmem_unregister);
 
-static void devm_nvmem_release(struct device *dev, void *res)
+static void devm_nvmem_unregister(void *nvmem)
 {
-       nvmem_unregister(*(struct nvmem_device **)res);
+       nvmem_unregister(nvmem);
 }
 
 /**
@@ -926,20 +926,16 @@ static void devm_nvmem_release(struct device *dev, void *res)
 struct nvmem_device *devm_nvmem_register(struct device *dev,
                                         const struct nvmem_config *config)
 {
-       struct nvmem_device **ptr, *nvmem;
-
-       ptr = devres_alloc(devm_nvmem_release, sizeof(*ptr), GFP_KERNEL);
-       if (!ptr)
-               return ERR_PTR(-ENOMEM);
+       struct nvmem_device *nvmem;
+       int ret;
 
        nvmem = nvmem_register(config);
+       if (IS_ERR(nvmem))
+               return nvmem;
 
-       if (!IS_ERR(nvmem)) {
-               *ptr = nvmem;
-               devres_add(dev, ptr);
-       } else {
-               devres_free(ptr);
-       }
+       ret = devm_add_action_or_reset(dev, devm_nvmem_unregister, nvmem);
+       if (ret)
+               return ERR_PTR(ret);
 
        return nvmem;
 }