* [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable
@ 2017-05-17 6:50 Arvind Yadav
2017-05-17 7:14 ` Viresh Kumar
0 siblings, 1 reply; 2+ messages in thread
From: Arvind Yadav @ 2017-05-17 6:50 UTC (permalink / raw)
To: rjw, viresh.kumar; +Cc: linux-pm, linux-kernel
clk_prepare_enable() can fail here and we must check its return value.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/cpufreq/kirkwood-cpufreq.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 1b9bcd7..c2dd43f 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -127,7 +127,12 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
return PTR_ERR(priv.cpu_clk);
}
- clk_prepare_enable(priv.cpu_clk);
+ err = clk_prepare_enable(priv.cpu_clk);
+ if (err) {
+ dev_err(priv.dev, "Unable to prepare cpuclk\n");
+ return err;
+ }
+
kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
priv.ddr_clk = of_clk_get_by_name(np, "ddrclk");
@@ -137,7 +142,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
goto out_cpu;
}
- clk_prepare_enable(priv.ddr_clk);
+ err = clk_prepare_enable(priv.ddr_clk);
+ if (err) {
+ dev_err(priv.dev, "Unable to prepare ddrclk\n");
+ goto out_cpu;
+ }
kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;
priv.powersave_clk = of_clk_get_by_name(np, "powersave");
@@ -146,7 +155,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
err = PTR_ERR(priv.powersave_clk);
goto out_ddr;
}
- clk_prepare_enable(priv.powersave_clk);
+ err = clk_prepare_enable(priv.powersave_clk);
+ if (err) {
+ dev_err(priv.dev, "Unable to prepare powersave clk\n");
+ goto out_ddr;
+ }
of_node_put(np);
np = NULL;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable
2017-05-17 6:50 [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable Arvind Yadav
@ 2017-05-17 7:14 ` Viresh Kumar
0 siblings, 0 replies; 2+ messages in thread
From: Viresh Kumar @ 2017-05-17 7:14 UTC (permalink / raw)
To: Arvind Yadav; +Cc: rjw, linux-pm, linux-kernel
On 17-05-17, 12:20, Arvind Yadav wrote:
> clk_prepare_enable() can fail here and we must check its return value.
>
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
> ---
> drivers/cpufreq/kirkwood-cpufreq.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
> index 1b9bcd7..c2dd43f 100644
> --- a/drivers/cpufreq/kirkwood-cpufreq.c
> +++ b/drivers/cpufreq/kirkwood-cpufreq.c
> @@ -127,7 +127,12 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
> return PTR_ERR(priv.cpu_clk);
> }
>
> - clk_prepare_enable(priv.cpu_clk);
> + err = clk_prepare_enable(priv.cpu_clk);
> + if (err) {
> + dev_err(priv.dev, "Unable to prepare cpuclk\n");
> + return err;
> + }
> +
> kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
>
> priv.ddr_clk = of_clk_get_by_name(np, "ddrclk");
> @@ -137,7 +142,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
> goto out_cpu;
> }
>
> - clk_prepare_enable(priv.ddr_clk);
> + err = clk_prepare_enable(priv.ddr_clk);
> + if (err) {
> + dev_err(priv.dev, "Unable to prepare ddrclk\n");
> + goto out_cpu;
> + }
> kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;
>
> priv.powersave_clk = of_clk_get_by_name(np, "powersave");
> @@ -146,7 +155,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
> err = PTR_ERR(priv.powersave_clk);
> goto out_ddr;
> }
> - clk_prepare_enable(priv.powersave_clk);
> + err = clk_prepare_enable(priv.powersave_clk);
> + if (err) {
> + dev_err(priv.dev, "Unable to prepare powersave clk\n");
> + goto out_ddr;
> + }
>
> of_node_put(np);
> np = NULL;
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-17 7:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-17 6:50 [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable Arvind Yadav
2017-05-17 7:14 ` Viresh Kumar
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).