From 6c7f48ea2e663b679aa8e60d8d8e1e6306a644f9 Mon Sep 17 00:00:00 2001From: Miquel Raynal <miquel.raynal@bootlin.com>Date: Tue, 8 Aug 2023 08:29:27 +0200Subject: [PATCH] nvmem: core: Return NULL when no nvmem layout is foundCurrently, of_nvmem_layout_get_container() returns NULL on error, or anerror pointer if either CONFIG_NVMEM or CONFIG_OF is turned off. Weshould likely avoid this kind of mix for two reasons: to clarify theintend and anyway fix the !CONFIG_OF which will likely always if we usethis helper somewhere else. Let's just return NULL when no layout isfound, we don't need an error value here.Link: https://staticthinking.wordpress.com/2022/08/01/mixing-error-pointers-and-null/Fixes: 266570f496b9 ("nvmem: core: introduce NVMEM layouts")Reported-by: kernel test robot <lkp@intel.com>Reported-by: Dan Carpenter <dan.carpenter@linaro.org>Closes: https://lore.kernel.org/r/202308030002.DnSFOrMB-lkp@intel.com/Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>Reviewed-by: Michael Walle <michael@walle.cc>Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>--- include/linux/nvmem-consumer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)--- a/include/linux/nvmem-consumer.h+++ b/include/linux/nvmem-consumer.h@@ -256,7 +256,7 @@ static inline struct nvmem_device *of_nv static inline struct device_node * of_nvmem_layout_get_container(struct nvmem_device *nvmem) {- return ERR_PTR(-EOPNOTSUPP);+ return NULL; } #endif /* CONFIG_NVMEM && CONFIG_OF */