From: "André Draszik" <andre.draszik@linaro.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Javier Martinez Canillas <javier@osg.samsung.com>,
Jon Hunter <jonathanh@nvidia.com>,
Dmitry Baryshkov <lumag@kernel.org>,
Oleksij Rempel <o.rempel@pengutronix.de>
Cc: "Peter Griffin" <peter.griffin@linaro.org>,
"Tudor Ambarus" <tudor.ambarus@linaro.org>,
"Will McVicker" <willmcvicker@google.com>,
"Juan Yescas" <jyescas@google.com>,
kernel-team@android.com, linux-kernel@vger.kernel.org,
"André Draszik" <andre.draszik@linaro.org>
Subject: [PATCH v2 5/8] regulator: core: remove dead code in regulator_resolve_supply()
Date: Fri, 09 Jan 2026 08:38:41 +0000 [thread overview]
Message-ID: <20260109-regulators-defer-v2-5-1a25dc968e60@linaro.org> (raw)
In-Reply-To: <20260109-regulators-defer-v2-0-1a25dc968e60@linaro.org>
Since commit 98e48cd9283d ("regulator: core: resolve supply for
boot-on/always-on regulators") we require that a regulator's supply has
been resolved before enabling the regulator. Furthermore,
regulator_get() also fails if the supply hasn't been resolved yet
(preventing consumers from enabling a regulator without its supply
known). In combination this means that regulator_resolve_supply() now
always runs before the regulator has been enabled via
set_machine_constraints().
The code here was meant to run after enabling the regulator in case the
supply hadn't been resolved at that time and can therefore never
execute anymore since that commit.
Remove it.
No functional change intended.
Signed-off-by: André Draszik <andre.draszik@linaro.org>
---
v2:
- drop fixes tag (Mark)
---
drivers/regulator/core.c | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 08bdb1e4175e6d47d154e7a2d859a9d39dcfd021..fd8da369c0529da12d6e80d90032e07bed414316 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2282,28 +2282,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
/* rdev->supply was created in set_supply() */
link_and_create_debugfs(rdev->supply, r, &rdev->dev);
- /*
- * In set_machine_constraints() we may have turned this regulator on
- * but we couldn't propagate to the supply if it hadn't been resolved
- * yet. Do it now.
- */
- if (rdev->use_count) {
- ret = regulator_enable(rdev->supply);
- if (ret < 0) {
- struct regulator *supply;
-
- regulator_lock_two(rdev, rdev->supply->rdev, &ww_ctx);
-
- supply = rdev->supply;
- rdev->supply = NULL;
-
- regulator_unlock_two(rdev, supply->rdev, &ww_ctx);
-
- regulator_put(supply);
- goto out;
- }
- }
-
out:
return ret;
}
--
2.52.0.457.g6b5491de43-goog
next prev parent reply other threads:[~2026-01-09 8:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-09 8:38 [PATCH v2 0/8] regulator: core: allow regulator_register() with missing required supply André Draszik
2026-01-09 8:38 ` [PATCH v2 1/8] regulator: core: update two debug messages André Draszik
2026-01-09 8:38 ` [PATCH v2 2/8] regulator: core: fix locking in regulator_resolve_supply() error path André Draszik
2026-01-09 8:38 ` [PATCH v2 3/8] regulator: core: move supply check earlier in set_machine_constraints() André Draszik
2026-01-09 8:38 ` [PATCH v2 4/8] regulator: core: streamline supply resolution for always-on/boot-on regulators André Draszik
2026-01-09 8:38 ` André Draszik [this message]
2026-01-09 8:38 ` [PATCH v2 6/8] regulator: core: don't ignore errors from event forwarding setup André Draszik
2026-01-09 8:38 ` [PATCH v2 7/8] regulator: core: reresolve unresolved supplies when available André Draszik
2026-01-09 8:38 ` [PATCH v2 8/8] regulator: core: don't fail regulator_register() with missing required supply André Draszik
2026-01-12 14:31 ` [PATCH v2 0/8] regulator: core: allow " Mark Brown
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=20260109-regulators-defer-v2-5-1a25dc968e60@linaro.org \
--to=andre.draszik@linaro.org \
--cc=broonie@kernel.org \
--cc=javier@osg.samsung.com \
--cc=jonathanh@nvidia.com \
--cc=jyescas@google.com \
--cc=kernel-team@android.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lumag@kernel.org \
--cc=o.rempel@pengutronix.de \
--cc=peter.griffin@linaro.org \
--cc=tudor.ambarus@linaro.org \
--cc=willmcvicker@google.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 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®