From: Viresh Kumar <viresh.kumar@linaro.org>
To: Rafael Wysocki <rjw@rjwysocki.net>,
nm@ti.com, sboyd@codeaurora.org,
Viresh Kumar <vireshk@kernel.org>
Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
robh@kernel.org, d-gerlach@ti.com, broonie@kernel.org,
devicetree@vger.kernel.org,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH V5 09/10] PM / OPP: Don't WARN on multiple calls to dev_pm_opp_set_regulators()
Date: Tue, 29 Nov 2016 12:06:56 +0530 [thread overview]
Message-ID: <2b7f54b32e1a07d8dbfcdbccf1c71aa8657f32f8.1480401041.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1480401041.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1480401041.git.viresh.kumar@linaro.org>
If a platform specific OPP driver has called this routine first and set
the regulators, then the second call from cpufreq-dt driver will hit the
WARN_ON(). Remove the WARN_ON(), but continue to return error in such
cases.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Tested-by: Dave Gerlach <d-gerlach@ti.com>
---
drivers/base/power/opp/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index ddd4915ffd4f..3c9f223709ab 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -1484,7 +1484,7 @@ int dev_pm_opp_set_regulators(struct device *dev, const char * const names[],
}
/* Already have regulators set */
- if (WARN_ON(opp_table->regulators)) {
+ if (opp_table->regulators) {
ret = -EBUSY;
goto err;
}
--
2.7.1.410.g6faf27b
next prev parent reply other threads:[~2016-11-29 6:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-29 6:36 [PATCH V5 00/10] PM / OPP: Multiple regulator support Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 01/10] PM / OPP: Fix incorrect cpu-supply property in binding Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 02/10] PM / OPP: Reword binding supporting multiple regulators per device Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 03/10] PM / OPP: Don't use OPP structure outside of rcu protected section Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 04/10] PM / OPP: Manage supply's voltage/current in a separate structure Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 05/10] PM / OPP: Pass struct dev_pm_opp_supply to _set_opp_voltage() Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 06/10] PM / OPP: Add infrastructure to manage multiple regulators Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 07/10] PM / OPP: Separate out _generic_set_opp() Viresh Kumar
2016-11-29 6:36 ` [PATCH V5 08/10] PM / OPP: Allow platform specific custom set_opp() callbacks Viresh Kumar
2016-11-29 6:36 ` Viresh Kumar [this message]
2016-11-29 6:36 ` [PATCH V5 10/10] PM / OPP: Don't assume platform doesn't have regulators Viresh Kumar
2016-11-29 12:48 ` [PATCH V5 00/10] PM / OPP: Multiple regulator support Rafael J. Wysocki
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=2b7f54b32e1a07d8dbfcdbccf1c71aa8657f32f8.1480401041.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=broonie@kernel.org \
--cc=d-gerlach@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=robh@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=vincent.guittot@linaro.org \
--cc=vireshk@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).