From: Douglas Anderson <dianders@chromium.org>
To: Mark Brown <broonie@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
evgreen@chromium.org, swboyd@chromium.org,
Dmitry Osipenko <digetx@gmail.com>,
ryandcase@chromium.org, David Collins <collinsd@codeaurora.org>,
linux-arm-msm@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] regulator: core: Don't double-disable supplies in regulator_disable_deferred()
Date: Mon, 19 Nov 2018 16:26:50 -0800 [thread overview]
Message-ID: <20181120002654.1891-3-dianders@chromium.org> (raw)
In-Reply-To: <20181120002654.1891-1-dianders@chromium.org>
In the commit f8702f9e4aa7 ("regulator: core: Use ww_mutex for
regulators locking") disabling of the supply was moved into
_regulator_disable(). That means regulator_disable_work() shouldn't
be disabling since that double-disables the supply.
Fixes: f8702f9e4aa7 ("regulator: core: Use ww_mutex for regulators locking")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
drivers/regulator/core.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 0052bbc8c531..63a8af1e2256 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2703,16 +2703,6 @@ static void regulator_disable_work(struct work_struct *work)
regulator_balance_voltage(rdev, PM_SUSPEND_ON);
regulator_unlock_dependent(rdev, &ww_ctx);
-
- if (rdev->supply) {
- for (i = 0; i < count; i++) {
- ret = regulator_disable(rdev->supply);
- if (ret != 0) {
- rdev_err(rdev,
- "Supply disable failed: %d\n", ret);
- }
- }
- }
}
/**
--
2.19.1.1215.g8438c0b245-goog
next prev parent reply other threads:[~2018-11-20 0:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 0:26 [PATCH 1/7] regulator: core: Properly expose requested_microamps in sysfs Douglas Anderson
2018-11-20 0:26 ` [PATCH 2/7] regulator: core: Don't assume always_on when is_enabled returns err Douglas Anderson
2018-11-20 16:00 ` Mark Brown
2018-11-20 18:17 ` Doug Anderson
2018-11-20 0:26 ` Douglas Anderson [this message]
2018-11-20 0:45 ` [PATCH 3/7] regulator: core: Don't double-disable supplies in regulator_disable_deferred() Dmitry Osipenko
2018-11-20 0:26 ` [PATCH 4/7] regulator: core: Only count load for enabled consumers Douglas Anderson
2018-11-20 0:26 ` [PATCH 5/7] regulator: core: add enable_count for consumers to debug fs Douglas Anderson
2018-11-20 16:10 ` Mark Brown
2018-11-20 16:52 ` Doug Anderson
2018-11-20 16:58 ` Mark Brown
2018-11-20 17:05 ` Doug Anderson
2018-11-20 17:57 ` Doug Anderson
2018-11-20 0:26 ` [PATCH 6/7] regulator: core: Avoid propagating to supplies when possible Douglas Anderson
2018-11-20 0:26 ` [PATCH 7/7] regulator: core: Remove loop disabling supplies in regulator_force_disable() Douglas Anderson
2018-11-20 0:58 ` Dmitry Osipenko
2018-11-20 2:05 ` Doug Anderson
2018-11-20 15:54 ` Mark Brown
2018-11-20 16:04 ` Doug Anderson
2018-11-20 16:25 ` Mark Brown
2018-11-20 16:57 ` Doug Anderson
2018-11-20 16:59 ` Mark Brown
2018-11-20 17:00 ` Mark Brown
2018-11-20 17:55 ` Doug Anderson
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=20181120002654.1891-3-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=collinsd@codeaurora.org \
--cc=digetx@gmail.com \
--cc=evgreen@chromium.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ryandcase@chromium.org \
--cc=swboyd@chromium.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).