* [PATCH 1/2] cpufreq: imx6q: remove unused code
@ 2018-11-26 2:59 Anson Huang
2018-11-26 2:59 ` [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Anson Huang
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Anson Huang @ 2018-11-26 2:59 UTC (permalink / raw)
To: rjw, viresh.kumar, linux-pm, linux-kernel; +Cc: dl-linux-imx
In voltage scale down path, the return value is NOT
used at all, remove them to simplify the code.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
drivers/cpufreq/imx6q-cpufreq.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index d8c3595..8cb9683 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -177,22 +177,16 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
/* scaling down? scale voltage after frequency */
if (new_freq < old_freq) {
ret = regulator_set_voltage_tol(arm_reg, volt, 0);
- if (ret) {
+ if (ret)
dev_warn(cpu_dev,
"failed to scale vddarm down: %d\n", ret);
- ret = 0;
- }
ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);
- if (ret) {
+ if (ret)
dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);
- ret = 0;
- }
if (!IS_ERR(pu_reg)) {
ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
- if (ret) {
+ if (ret)
dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);
- ret = 0;
- }
}
}
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read
2018-11-26 2:59 [PATCH 1/2] cpufreq: imx6q: remove unused code Anson Huang
@ 2018-11-26 2:59 ` Anson Huang
2018-11-26 6:05 ` Viresh Kumar
2018-11-26 6:04 ` [PATCH 1/2] cpufreq: imx6q: remove unused code Viresh Kumar
2018-12-11 10:49 ` Rafael J. Wysocki
2 siblings, 1 reply; 5+ messages in thread
From: Anson Huang @ 2018-11-26 2:59 UTC (permalink / raw)
To: rjw, viresh.kumar, linux-pm, linux-kernel; +Cc: dl-linux-imx
Put return value checks of calling imx6ul_opp_check_speed_grading()
into one block to save one condition block for normal case.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
drivers/cpufreq/imx6q-cpufreq.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 8cb9683..9fedf62 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -405,9 +405,10 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
if (of_machine_is_compatible("fsl,imx6ul") ||
of_machine_is_compatible("fsl,imx6ull")) {
ret = imx6ul_opp_check_speed_grading(cpu_dev);
- if (ret == -EPROBE_DEFER)
- return ret;
if (ret) {
+ if (ret == -EPROBE_DEFER)
+ return ret;
+
dev_err(cpu_dev, "failed to read ocotp: %d\n",
ret);
return ret;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] cpufreq: imx6q: remove unused code
2018-11-26 2:59 [PATCH 1/2] cpufreq: imx6q: remove unused code Anson Huang
2018-11-26 2:59 ` [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Anson Huang
@ 2018-11-26 6:04 ` Viresh Kumar
2018-12-11 10:49 ` Rafael J. Wysocki
2 siblings, 0 replies; 5+ messages in thread
From: Viresh Kumar @ 2018-11-26 6:04 UTC (permalink / raw)
To: Anson Huang; +Cc: rjw, linux-pm, linux-kernel, dl-linux-imx
On 26-11-18, 02:59, Anson Huang wrote:
> In voltage scale down path, the return value is NOT
> used at all, remove them to simplify the code.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> drivers/cpufreq/imx6q-cpufreq.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
> index d8c3595..8cb9683 100644
> --- a/drivers/cpufreq/imx6q-cpufreq.c
> +++ b/drivers/cpufreq/imx6q-cpufreq.c
> @@ -177,22 +177,16 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
> /* scaling down? scale voltage after frequency */
> if (new_freq < old_freq) {
> ret = regulator_set_voltage_tol(arm_reg, volt, 0);
> - if (ret) {
> + if (ret)
> dev_warn(cpu_dev,
> "failed to scale vddarm down: %d\n", ret);
> - ret = 0;
> - }
> ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);
> - if (ret) {
> + if (ret)
> dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);
> - ret = 0;
> - }
> if (!IS_ERR(pu_reg)) {
> ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
> - if (ret) {
> + if (ret)
> dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);
> - ret = 0;
> - }
> }
> }
>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read
2018-11-26 2:59 ` [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Anson Huang
@ 2018-11-26 6:05 ` Viresh Kumar
0 siblings, 0 replies; 5+ messages in thread
From: Viresh Kumar @ 2018-11-26 6:05 UTC (permalink / raw)
To: Anson Huang; +Cc: rjw, linux-pm, linux-kernel, dl-linux-imx
On 26-11-18, 02:59, Anson Huang wrote:
> Put return value checks of calling imx6ul_opp_check_speed_grading()
> into one block to save one condition block for normal case.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> drivers/cpufreq/imx6q-cpufreq.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
> index 8cb9683..9fedf62 100644
> --- a/drivers/cpufreq/imx6q-cpufreq.c
> +++ b/drivers/cpufreq/imx6q-cpufreq.c
> @@ -405,9 +405,10 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
> if (of_machine_is_compatible("fsl,imx6ul") ||
> of_machine_is_compatible("fsl,imx6ull")) {
> ret = imx6ul_opp_check_speed_grading(cpu_dev);
> - if (ret == -EPROBE_DEFER)
> - return ret;
> if (ret) {
> + if (ret == -EPROBE_DEFER)
> + return ret;
> +
> dev_err(cpu_dev, "failed to read ocotp: %d\n",
> ret);
> return ret;
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] cpufreq: imx6q: remove unused code
2018-11-26 2:59 [PATCH 1/2] cpufreq: imx6q: remove unused code Anson Huang
2018-11-26 2:59 ` [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Anson Huang
2018-11-26 6:04 ` [PATCH 1/2] cpufreq: imx6q: remove unused code Viresh Kumar
@ 2018-12-11 10:49 ` Rafael J. Wysocki
2 siblings, 0 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2018-12-11 10:49 UTC (permalink / raw)
To: Anson Huang; +Cc: viresh.kumar, linux-pm, linux-kernel, dl-linux-imx
On Monday, November 26, 2018 3:59:45 AM CET Anson Huang wrote:
> In voltage scale down path, the return value is NOT
> used at all, remove them to simplify the code.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> drivers/cpufreq/imx6q-cpufreq.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
> index d8c3595..8cb9683 100644
> --- a/drivers/cpufreq/imx6q-cpufreq.c
> +++ b/drivers/cpufreq/imx6q-cpufreq.c
> @@ -177,22 +177,16 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
> /* scaling down? scale voltage after frequency */
> if (new_freq < old_freq) {
> ret = regulator_set_voltage_tol(arm_reg, volt, 0);
> - if (ret) {
> + if (ret)
> dev_warn(cpu_dev,
> "failed to scale vddarm down: %d\n", ret);
> - ret = 0;
> - }
> ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);
> - if (ret) {
> + if (ret)
> dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);
> - ret = 0;
> - }
> if (!IS_ERR(pu_reg)) {
> ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);
> - if (ret) {
> + if (ret)
> dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);
> - ret = 0;
> - }
> }
> }
>
>
Both this one and the [2/2] applied with ACKs from Viresh.
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-11 10:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-26 2:59 [PATCH 1/2] cpufreq: imx6q: remove unused code Anson Huang
2018-11-26 2:59 ` [PATCH 2/2] cpufreq: imx6q: save one condition block for normal case of nvmem read Anson Huang
2018-11-26 6:05 ` Viresh Kumar
2018-11-26 6:04 ` [PATCH 1/2] cpufreq: imx6q: remove unused code Viresh Kumar
2018-12-11 10:49 ` Rafael J. Wysocki
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).