Commit 5825b2c6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220220151527.17216-3-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 190fae46

drivers/nvmem/core.c

+9 −13
Original line number Diff line number Diff line
@@ -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;

}