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 [thread overview]
Message-ID: <20180921134026.4596-14-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20180921134026.4596-1-srinivas.kandagatla@linaro.org>
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(-)
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;
}
--
2.19.0
next prev parent reply other threads:[~2018-09-21 13:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 13:40 [PATCH 00/26] nvmem: patches for 4.20 srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 01/26] eeprom: eeprom_93xx46: use resource management srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 02/26] eeprom: at25: use devm_nvmem_register() srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 03/26] nvmem: provide nvmem_dev_name() srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 04/26] nvmem: remove the name field from struct nvmem_device srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 05/26] nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells() srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 06/26] nvmem: remove a stray newline srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 07/26] nvmem: check the return value of nvmem_add_cells() srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 08/26] nvmem: use kref srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 09/26] nvmem: sunxi_sid: return -ENOMEM if kzalloc() fails srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 10/26] nvmem: sunxi_sid: use devm_nvmem_register() srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 11/26] nvmem: lpc18xx_eeprom: " srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 12/26] nvmem: mxs-ocotp: " srinivas.kandagatla
2018-09-21 13:40 ` srinivas.kandagatla [this message]
2018-09-21 13:40 ` [PATCH 14/26] nvmem: remove the global cell list srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 15/26] nvmem: add support for cell info srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 16/26] nvmem: resolve cells from DT at registration time srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 17/26] nvmem: add support for cell lookups from machine code srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 18/26] Documentation: nvmem: document cell tables and lookup entries srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 19/26] nvmem: add a notifier chain srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 20/26] nvmem: use SPDX license identifiers srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 21/26] nvmem: make the naming of arguments in nvmem_cell_get() consistent srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 22/26] nvmem: use EOPNOTSUPP instead of ENOSYS srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 23/26] nvmem: fix commenting style srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 24/26] nvmem: use octal permissions instead of constants srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 25/26] nvmem: sunxi_sid: remove unused variable in probe srinivas.kandagatla
2018-09-21 13:40 ` [PATCH 26/26] nvmem: make nvmem_add_cells() static srinivas.kandagatla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180921134026.4596-14-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=bgolaszewski@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).