From: Maciej Purski <m.purski@samsung.com>
To: Mark Brown <broonie@kernel.org>, Tony Lindgren <tony@atomide.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Carlos Hernandez <ceh@ti.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Maciej Purski <m.purski@samsung.com>
Subject: [PATCH 3/7] regulator: core: Use re-entrant locks
Date: Mon, 04 Jun 2018 15:59:20 +0200 [thread overview]
Message-ID: <1528120764-14316-4-git-send-email-m.purski@samsung.com> (raw)
In-Reply-To: <1528120764-14316-1-git-send-email-m.purski@samsung.com>
Re-entrant locks were implemented in previous patches. They should
substitute all mutex_lock() and mutex_unlock() calls on regulators'
mutexes.
Signed-off-by: Maciej Purski <m.purski@samsung.com>
---
drivers/regulator/core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 413a824..c5478d2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2274,9 +2274,9 @@ int regulator_enable(struct regulator *regulator)
return ret;
}
- mutex_lock(&rdev->mutex);
+ regulator_lock(rdev);
ret = _regulator_enable(rdev);
- mutex_unlock(&rdev->mutex);
+ regulator_unlock(rdev);
if (ret != 0 && rdev->supply)
regulator_disable(rdev->supply);
@@ -2384,9 +2384,9 @@ int regulator_disable(struct regulator *regulator)
if (regulator->always_on)
return 0;
- mutex_lock(&rdev->mutex);
+ regulator_lock(rdev);
ret = _regulator_disable(rdev);
- mutex_unlock(&rdev->mutex);
+ regulator_unlock(rdev);
if (ret == 0 && rdev->supply)
regulator_disable(rdev->supply);
@@ -2436,10 +2436,10 @@ int regulator_force_disable(struct regulator *regulator)
struct regulator_dev *rdev = regulator->rdev;
int ret;
- mutex_lock(&rdev->mutex);
+ regulator_lock(rdev);
regulator->uA_load = 0;
ret = _regulator_force_disable(regulator->rdev);
- mutex_unlock(&rdev->mutex);
+ regulator_unlock(rdev);
if (rdev->supply)
while (rdev->open_count--)
@@ -2587,9 +2587,9 @@ int regulator_is_enabled(struct regulator *regulator)
if (regulator->always_on)
return 1;
- mutex_lock(®ulator->rdev->mutex);
+ regulator_lock(regulator->rdev);
ret = _regulator_is_enabled(regulator->rdev);
- mutex_unlock(®ulator->rdev->mutex);
+ regulator_unlock(regulator->rdev);
return ret;
}
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: m.purski@samsung.com (Maciej Purski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/7] regulator: core: Use re-entrant locks
Date: Mon, 04 Jun 2018 15:59:20 +0200 [thread overview]
Message-ID: <1528120764-14316-4-git-send-email-m.purski@samsung.com> (raw)
In-Reply-To: <1528120764-14316-1-git-send-email-m.purski@samsung.com>
Re-entrant locks were implemented in previous patches. They should
substitute all mutex_lock() and mutex_unlock() calls on regulators'
mutexes.
Signed-off-by: Maciej Purski <m.purski@samsung.com>
---
drivers/regulator/core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 413a824..c5478d2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2274,9 +2274,9 @@ int regulator_enable(struct regulator *regulator)
return ret;
}
- mutex_lock(&rdev->mutex);
+ regulator_lock(rdev);
ret = _regulator_enable(rdev);
- mutex_unlock(&rdev->mutex);
+ regulator_unlock(rdev);
if (ret != 0 && rdev->supply)
regulator_disable(rdev->supply);
@@ -2384,9 +2384,9 @@ int regulator_disable(struct regulator *regulator)
if (regulator->always_on)
return 0;
- mutex_lock(&rdev->mutex);
+ regulator_lock(rdev);
ret = _regulator_disable(rdev);
- mutex_unlock(&rdev->mutex);
+ regulator_unlock(rdev);
if (ret == 0 && rdev->supply)
regulator_disable(rdev->supply);
@@ -2436,10 +2436,10 @@ int regulator_force_disable(struct regulator *regulator)
struct regulator_dev *rdev = regulator->rdev;
int ret;
- mutex_lock(&rdev->mutex);
+ regulator_lock(rdev);
regulator->uA_load = 0;
ret = _regulator_force_disable(regulator->rdev);
- mutex_unlock(&rdev->mutex);
+ regulator_unlock(rdev);
if (rdev->supply)
while (rdev->open_count--)
@@ -2587,9 +2587,9 @@ int regulator_is_enabled(struct regulator *regulator)
if (regulator->always_on)
return 1;
- mutex_lock(®ulator->rdev->mutex);
+ regulator_lock(regulator->rdev);
ret = _regulator_is_enabled(regulator->rdev);
- mutex_unlock(®ulator->rdev->mutex);
+ regulator_unlock(regulator->rdev);
return ret;
}
--
2.7.4
next prev parent reply other threads:[~2018-06-04 14:00 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 22:15 Regression in Linux next again Tony Lindgren
2018-05-29 22:15 ` Tony Lindgren
2018-05-30 9:13 ` Mark Brown
2018-05-30 9:13 ` Mark Brown
2018-05-30 14:03 ` Maciej Purski
2018-05-30 14:03 ` Maciej Purski
2018-05-30 14:33 ` Mark Brown
2018-05-30 14:33 ` Mark Brown
2018-05-30 14:45 ` Tony Lindgren
2018-05-30 14:45 ` Tony Lindgren
[not found] ` <CGME20180604135952eucas1p292f7bcec405e6a1a6261031df36cad32@eucas1p2.samsung.com>
2018-06-04 13:59 ` Maciej Purski
2018-06-04 13:59 ` Maciej Purski
[not found] ` <CGME20180604135952eucas1p2d76b6aa5d8fc9912113d519b48f7e99a@eucas1p2.samsung.com>
2018-06-04 13:59 ` [PATCH 1/7] regulator: core: Add debug messages Maciej Purski
2018-06-04 13:59 ` Maciej Purski
[not found] ` <CGME20180604135952eucas1p2e3fdb68bf31e32b7c9557051671885a9@eucas1p2.samsung.com>
2018-06-04 13:59 ` [PATCH 2/7] regulator: core: Add regulator_set_voltage_rdev() Maciej Purski
2018-06-04 13:59 ` Maciej Purski
[not found] ` <CGME20180604135953eucas1p2f2c9dd9581cd114d323c3d64afe5c308@eucas1p2.samsung.com>
2018-06-04 13:59 ` Maciej Purski [this message]
2018-06-04 13:59 ` [PATCH 3/7] regulator: core: Use re-entrant locks Maciej Purski
[not found] ` <CGME20180604135953eucas1p2ec281df0793bc73e79f3000837abcb04@eucas1p2.samsung.com>
2018-06-04 13:59 ` [PATCH 4/7] regulator: core: Implement voltage balancing algorithm Maciej Purski
2018-06-04 13:59 ` Maciej Purski
2018-06-04 13:59 ` Maciej Purski
[not found] ` <CGME20180604135954eucas1p2156fed3300b5514a4efa2baf9e7b9bc5@eucas1p2.samsung.com>
2018-06-04 13:59 ` [PATCH 5/7] regulator: core: Lock dependent regulators Maciej Purski
2018-06-04 13:59 ` Maciej Purski
2018-06-04 13:59 ` Maciej Purski
2018-06-04 14:20 ` Lucas Stach
2018-06-04 14:20 ` Lucas Stach
2018-06-18 12:37 ` Maciej Purski
2018-06-18 12:37 ` Maciej Purski
[not found] ` <CGME20180604135954eucas1p2eeb77ada3ca97fecc6caec20d7e8397a@eucas1p2.samsung.com>
2018-06-04 13:59 ` [PATCH 6/7] regulator: core: Lock dependent regulators on regulator_enable() Maciej Purski
2018-06-04 13:59 ` Maciej Purski
[not found] ` <CGME20180604135954eucas1p2bebd1c4970401bb957da228056f9a662@eucas1p2.samsung.com>
2018-06-04 13:59 ` [PATCH 7/7] regulator: core: Enable voltage balancing Maciej Purski
2018-06-04 13:59 ` Maciej Purski
2018-06-04 23:13 ` kbuild test robot
2018-06-04 23:13 ` kbuild test robot
2018-06-04 23:13 ` kbuild test robot
2018-06-04 23:54 ` kbuild test robot
2018-06-04 23:54 ` kbuild test robot
2018-06-04 23:54 ` kbuild test robot
2018-06-05 4:45 ` Regression in Linux next again Tony Lindgren
2018-06-05 4:45 ` Tony Lindgren
[not found] ` <CGME20180613103622eucas1p1778ba2c2e5dd85ccb4c488bd0a38386d@eucas1p1.samsung.com>
2018-06-13 10:33 ` [PATCH v2] regulator: core: Enable voltage balancing Maciej Purski
2018-06-13 10:33 ` Maciej Purski
2018-06-15 11:29 ` Tony Lindgren
2018-06-15 11:29 ` Tony Lindgren
2018-06-18 13:17 ` Maciej Purski
2018-06-18 13:17 ` Maciej Purski
[not found] ` <CGME20180618140856eucas1p281619f9bf003655a3c2eac356216ab25@eucas1p2.samsung.com>
2018-06-18 14:08 ` [PATCH] regulator: core: Pass max_uV value to regulator_set_voltage_rdev Maciej Purski
2018-06-18 14:08 ` Maciej Purski
2018-07-02 8:05 ` Tony Lindgren
2018-07-02 8:05 ` Tony Lindgren
2018-09-28 20:09 ` Dmitry Osipenko
2018-09-28 20:09 ` Dmitry Osipenko
2018-09-28 20:09 ` Dmitry Osipenko
2018-09-28 20:09 ` Dmitry Osipenko
2018-09-28 20:22 ` Tony Lindgren
2018-09-28 20:22 ` Tony Lindgren
2018-09-28 20:36 ` Dmitry Osipenko
2018-09-28 20:36 ` Dmitry Osipenko
2018-09-28 22:26 ` Dmitry Osipenko
2018-09-28 22:26 ` Dmitry Osipenko
2018-09-28 22:26 ` Dmitry Osipenko
2018-09-28 22:41 ` Tony Lindgren
2018-09-28 22:41 ` Tony Lindgren
2018-09-28 23:17 ` Dmitry Osipenko
2018-09-28 23:17 ` Dmitry Osipenko
2018-09-28 23:17 ` Dmitry Osipenko
2018-09-28 23:51 ` Dmitry Osipenko
2018-09-28 23:51 ` Dmitry Osipenko
2018-09-28 23:51 ` Dmitry Osipenko
2018-09-29 0:27 ` Tony Lindgren
2018-09-29 0:27 ` Tony Lindgren
2018-09-29 0:44 ` Dmitry Osipenko
2018-09-29 0:44 ` Dmitry Osipenko
2018-10-01 7:25 ` Maciej Purski
2018-10-01 7:25 ` Maciej Purski
2018-10-01 13:34 ` Dmitry Osipenko
2018-10-01 13:34 ` Dmitry Osipenko
2018-05-30 14:53 ` Regression in Linux next again Naresh Kamboju
2018-05-30 14:53 ` Naresh Kamboju
2018-05-31 5:44 ` Naresh Kamboju
2018-05-31 5:44 ` Naresh Kamboju
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=1528120764-14316-4-git-send-email-m.purski@samsung.com \
--to=m.purski@samsung.com \
--cc=broonie@kernel.org \
--cc=ceh@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.