From: Heiner Kallweit <hkallweit1@gmail.com>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/3] nvmem: core: remove nvmem_mutex
Date: Sun, 4 Jun 2017 13:02:02 +0200 [thread overview]
Message-ID: <10bbabba-377c-804f-6466-167699138ab3@gmail.com> (raw)
In-Reply-To: <32c019d9-656d-6214-af2a-bef7e91dc1de@gmail.com>
Mutex nvmem_mutex is used in __nvmem_device_get only and isn't needed
due to:
- of_nvmem_find just calls bus_find_device which doesn't need locking
- nvmem_find_cell is protected by nvmem_cells_mutex
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/nvmem/core.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 1aa6d25a..783eb431 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -55,7 +55,6 @@ struct nvmem_cell {
struct list_head node;
};
-static DEFINE_MUTEX(nvmem_mutex);
static DEFINE_IDA(nvmem_ida);
static LIST_HEAD(nvmem_cells);
@@ -538,14 +537,10 @@ static struct nvmem_device *__nvmem_device_get(struct device_node *np,
{
struct nvmem_device *nvmem = NULL;
- mutex_lock(&nvmem_mutex);
-
if (np) {
nvmem = of_nvmem_find(np);
- if (!nvmem) {
- mutex_unlock(&nvmem_mutex);
+ if (!nvmem)
return ERR_PTR(-EPROBE_DEFER);
- }
} else {
struct nvmem_cell *cell = nvmem_find_cell(cell_id);
@@ -554,14 +549,10 @@ static struct nvmem_device *__nvmem_device_get(struct device_node *np,
*cellp = cell;
}
- if (!nvmem) {
- mutex_unlock(&nvmem_mutex);
+ if (!nvmem)
return ERR_PTR(-ENOENT);
- }
}
- mutex_unlock(&nvmem_mutex);
-
if (!try_module_get(nvmem->owner)) {
dev_err(&nvmem->dev,
"could not increase module refcount for cell %s\n",
--
2.13.0
prev parent reply other threads:[~2017-06-04 11:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-04 10:48 [PATCH 0/3] nvmem: core: series with smaller refactorings Heiner Kallweit
2017-06-04 11:01 ` [PATCH 1/3] nvmem: core: remove member users from struct nvmem_device Heiner Kallweit
2017-06-07 15:30 ` Srinivas Kandagatla
2017-06-07 21:51 ` Heiner Kallweit
2017-06-08 6:34 ` Srinivas Kandagatla
2017-06-04 11:01 ` [PATCH 2/3] nvmem: core: add locking to nvmem_find_cell Heiner Kallweit
2017-06-07 15:30 ` Srinivas Kandagatla
2017-06-04 11:02 ` Heiner Kallweit [this message]
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=10bbabba-377c-804f-6466-167699138ab3@gmail.com \
--to=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=srinivas.kandagatla@linaro.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
all inboxes | Powered by JetHome®