| Message ID | eb6df0f1f2c82db0d516b9b63820cfe0c0c97d5c.1404231535.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Jul 01, 2014 at 10:02:35PM +0530, Viresh Kumar wrote: > Currently, we defer probe if regulator_get() returned -EPROBE_DEFER, i.e. > regulator isn't registered yet. > > The same is true for clock as well, so lets defer in that case as well. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/cpufreq/cpufreq-cpu0.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c > index 4273a5f..b5b8e1c 100644 > --- a/drivers/cpufreq/cpufreq-cpu0.c > +++ b/drivers/cpufreq/cpufreq-cpu0.c > @@ -150,8 +150,17 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) > > cpu_clk = clk_get(cpu_dev, NULL); > if (IS_ERR(cpu_clk)) { > - ret = PTR_ERR(cpu_clk); If you keep this ... > - pr_err("failed to get cpu0 clock: %d\n", ret); > + /* > + * If cpu's clk node is present, but clock is not yet > + * registered, we should try defering probe. > + */ > + if (PTR_ERR(cpu_clk) == -EPROBE_DEFER) { ... you can use 'ret' here ... > + dev_err(cpu_dev, "cpu0 clock not ready, retry\n"); > + ret = -EPROBE_DEFER; ... this can be saved ... > + } else { > + ret = PTR_ERR(cpu_clk); ... and this as well. Shawn > + dev_err(cpu_dev, "failed to get cpu0 clock: %d\n", ret); > + } > goto out_put_reg; > } > > -- > 2.0.0.rc2 > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2 July 2014 11:23, Shawn Guo <shawn.guo@linaro.org> wrote: > On Tue, Jul 01, 2014 at 10:02:35PM +0530, Viresh Kumar wrote: >> diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c >> index 4273a5f..b5b8e1c 100644 >> --- a/drivers/cpufreq/cpufreq-cpu0.c >> +++ b/drivers/cpufreq/cpufreq-cpu0.c >> @@ -150,8 +150,17 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) >> >> cpu_clk = clk_get(cpu_dev, NULL); >> if (IS_ERR(cpu_clk)) { >> - ret = PTR_ERR(cpu_clk); > > If you keep this ... > >> - pr_err("failed to get cpu0 clock: %d\n", ret); >> + /* >> + * If cpu's clk node is present, but clock is not yet >> + * registered, we should try defering probe. >> + */ >> + if (PTR_ERR(cpu_clk) == -EPROBE_DEFER) { > > ... you can use 'ret' here ... > >> + dev_err(cpu_dev, "cpu0 clock not ready, retry\n"); >> + ret = -EPROBE_DEFER; > > ... this can be saved ... > >> + } else { >> + ret = PTR_ERR(cpu_clk); > > ... and this as well. All accepted. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index 4273a5f..b5b8e1c 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -150,8 +150,17 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) cpu_clk = clk_get(cpu_dev, NULL); if (IS_ERR(cpu_clk)) { - ret = PTR_ERR(cpu_clk); - pr_err("failed to get cpu0 clock: %d\n", ret); + /* + * If cpu's clk node is present, but clock is not yet + * registered, we should try defering probe. + */ + if (PTR_ERR(cpu_clk) == -EPROBE_DEFER) { + dev_err(cpu_dev, "cpu0 clock not ready, retry\n"); + ret = -EPROBE_DEFER; + } else { + ret = PTR_ERR(cpu_clk); + dev_err(cpu_dev, "failed to get cpu0 clock: %d\n", ret); + } goto out_put_reg; }
Currently, we defer probe if regulator_get() returned -EPROBE_DEFER, i.e. regulator isn't registered yet. The same is true for clock as well, so lets defer in that case as well. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/cpufreq-cpu0.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)