[13/26] nvmem: change the signature of nvmem_unregister()

Message ID	20180921134026.4596-14-srinivas.kandagatla@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Subject: [PATCH 13/26] nvmem: change the signature of nvmem_unregister() Date: Fri, 21 Sep 2018 06:40:13 -0700 Message-Id: <20180921134026.4596-14-srinivas.kandagatla@linaro.org> In-Reply-To: <20180921134026.4596-1-srinivas.kandagatla@linaro.org> References: <20180921134026.4596-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	nvmem: patches for 4.20 \| expand [00/26] nvmem: patches for 4.20 [01/26] eeprom: eeprom_93xx46: use resource management [02/26] eeprom: at25: use devm_nvmem_register() [03/26] nvmem: provide nvmem_dev_name() [04/26] nvmem: remove the name field from struct nvmem_device [05/26] nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells() [06/26] nvmem: remove a stray newline [07/26] nvmem: check the return value of nvmem_add_cells() [08/26] nvmem: use kref [09/26] nvmem: sunxi_sid: return -ENOMEM if kzalloc() fails [10/26] nvmem: sunxi_sid: use devm_nvmem_register() [11/26] nvmem: lpc18xx_eeprom: use devm_nvmem_register() [12/26] nvmem: mxs-ocotp: use devm_nvmem_register() [13/26] nvmem: change the signature of nvmem_unregister() [14/26] nvmem: remove the global cell list [15/26] nvmem: add support for cell info [16/26] nvmem: resolve cells from DT at registration time [17/26] nvmem: add support for cell lookups from machine code [18/26] Documentation: nvmem: document cell tables and lookup entries [19/26] nvmem: add a notifier chain [20/26] nvmem: use SPDX license identifiers [21/26] nvmem: make the naming of arguments in nvmem_cell_get() consistent [22/26] nvmem: use EOPNOTSUPP instead of ENOSYS [23/26] nvmem: fix commenting style [24/26] nvmem: use octal permissions instead of constants [25/26] nvmem: sunxi_sid: remove unused variable in probe [26/26] nvmem: make nvmem_add_cells() static

Message ID

20180921134026.4596-14-srinivas.kandagatla@linaro.org

State

New

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: srinivas.kandagatla@linaro.org
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH 13/26] nvmem: change the signature of nvmem_unregister()
Date: Fri, 21 Sep 2018 06:40:13 -0700
Message-Id: <20180921134026.4596-14-srinivas.kandagatla@linaro.org>
In-Reply-To: <20180921134026.4596-1-srinivas.kandagatla@linaro.org>
References: <20180921134026.4596-1-srinivas.kandagatla@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

nvmem: patches for 4.20 | expand

Commit Message

Srinivas Kandagatla Sept. 21, 2018, 1:40 p.m. UTC

From: Bartosz Golaszewski <bgolaszewski@baylibre.com>


We switched the nvmem framework to using kref instead of manually
checking the current number of users in nvmem_unregister() so this
function can no longer fail. We also converted all remaining users
that still checked the return value of nvmem_unregister() to using
devm_nvmem_register(). Make the routine return void.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

---
 drivers/nvmem/core.c           | 8 ++------
 include/linux/nvmem-provider.h | 9 +++------
 2 files changed, 5 insertions(+), 12 deletions(-)

-- 
2.19.0

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 920b56e500cc..bd14d04782cd 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -553,20 +553,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 24def6ad09bb..0f357d0c1e75 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -70,7 +70,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);
@@ -87,10 +87,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)
-{
-	return -ENOSYS;
-}
+static inline void nvmem_unregister(struct nvmem_device *nvmem) {}
 
 static inline struct nvmem_device *
 devm_nvmem_register(struct device *dev, const struct nvmem_config *c)
@@ -101,7 +98,7 @@  devm_nvmem_register(struct device *dev, const struct nvmem_config *c)
 static inline int
 devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem)
 {
-	return nvmem_unregister(nvmem);
+	return -ENOSYS;
 
 }

[13/26] nvmem: change the signature of nvmem_unregister()

Commit Message

Patch