From: Heiner Kallweit <heiner.kallweit@web.de>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-pm@vger.kernel.org
Subject: [PATCH 2/2] cpufreq: imx: fix regulator_get_optional error handling
Date: Sun, 18 Oct 2015 13:23:29 +0200 [thread overview]
Message-ID: <56238131.7010907@web.de> (raw)
Properly handle the case that regulator_get_optional returns -EPROBE_DEFER
and ignore other errors.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/cpufreq/imx6q-cpufreq.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 0bb33dc..67dc81c 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -67,7 +67,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
/* scaling up? scale voltage before frequency */
if (new_freq > old_freq) {
- if (!IS_ERR(pu_reg)) {
+ if (pu_reg) {
ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
if (ret) {
dev_err(cpu_dev, "failed to scale vddpu up: %d\n", ret);
@@ -124,7 +124,7 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);
ret = 0;
}
- if (!IS_ERR(pu_reg)) {
+ if (pu_reg) {
ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
if (ret) {
dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);
@@ -195,6 +195,13 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
}
pu_reg = regulator_get_optional(cpu_dev, "pu");
+ if (IS_ERR(pu_reg)) {
+ if (PTR_ERR(pu_reg) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ goto put_reg;
+ } else
+ pu_reg = NULL;
+ }
soc_reg = regulator_get(cpu_dev, "soc");
if (IS_ERR(soc_reg)) {
@@ -285,7 +292,7 @@ soc_opp_out:
ret = regulator_set_voltage_time(soc_reg, imx6_soc_volt[0], imx6_soc_volt[num - 1]);
if (ret > 0)
transition_latency += ret * 1000;
- if (!IS_ERR(pu_reg)) {
+ if (pu_reg) {
ret = regulator_set_voltage_time(pu_reg, imx6_soc_volt[0], imx6_soc_volt[num - 1]);
if (ret > 0)
transition_latency += ret * 1000;
@@ -325,7 +332,7 @@ out_free_opp:
put_reg:
if (!IS_ERR(arm_reg))
regulator_put(arm_reg);
- if (!IS_ERR(pu_reg))
+ if (!IS_ERR_OR_NULL(pu_reg))
regulator_put(pu_reg);
if (!IS_ERR(soc_reg))
regulator_put(soc_reg);
@@ -351,7 +358,7 @@ static int imx6q_cpufreq_remove(struct platform_device *pdev)
if (free_opp)
of_free_opp_table(cpu_dev);
regulator_put(arm_reg);
- if (!IS_ERR(pu_reg))
+ if (pu_reg)
regulator_put(pu_reg);
regulator_put(soc_reg);
clk_put(arm_clk);
--
2.6.1
next reply other threads:[~2015-10-18 11:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-18 11:23 Heiner Kallweit [this message]
2015-10-20 13:31 ` [PATCH 2/2] cpufreq: imx: fix regulator_get_optional error handling Sascha Hauer
2015-10-20 13:44 ` Sascha Hauer
2015-10-20 14:36 ` Heiner Kallweit
2015-10-20 15:55 ` [PATCH] cpufreq: imx6q: cleanup resource allocation kbuild test robot
2015-10-21 11:02 ` [PATCH 2/2] cpufreq: imx: fix regulator_get_optional error handling Viresh Kumar
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=56238131.7010907@web.de \
--to=heiner.kallweit@web.de \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=viresh.kumar@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 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.