cpufreq: qcom-kryo: Silently error out on EPROBE_DEFER

Message ID 20180717204821.15987-1-niklas.cassel@linaro.org
State Accepted
Commit f54ab690ad68e4c5a5b4d4b5dbb28a35018546c5
Headers show
Series
  • cpufreq: qcom-kryo: Silently error out on EPROBE_DEFER
Related show

Commit Message

Niklas Cassel July 17, 2018, 8:48 p.m.
If of_nvmem_cell_get() fails due to probe deferal, we shouldn't print an
error message. Just be silent in this case.

Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>

---
 drivers/cpufreq/qcom-cpufreq-kryo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.17.1

Comments

Amit Kucheria July 18, 2018, 10:21 a.m. | #1
On Wed, Jul 18, 2018 at 2:18 AM, Niklas Cassel <niklas.cassel@linaro.org> wrote:
> If of_nvmem_cell_get() fails due to probe deferal, we shouldn't print an

> error message. Just be silent in this case.

>

> Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>


Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>


> ---

>  drivers/cpufreq/qcom-cpufreq-kryo.c | 5 +++--

>  1 file changed, 3 insertions(+), 2 deletions(-)

>

> diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c

> index 29389accf3e9..b8d1e6875f16 100644

> --- a/drivers/cpufreq/qcom-cpufreq-kryo.c

> +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c

> @@ -109,8 +109,9 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)

>         speedbin_nvmem = of_nvmem_cell_get(np, NULL);

>         of_node_put(np);

>         if (IS_ERR(speedbin_nvmem)) {

> -               dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",

> -                       PTR_ERR(speedbin_nvmem));

> +               if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)

> +                       dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",

> +                               PTR_ERR(speedbin_nvmem));

>                 return PTR_ERR(speedbin_nvmem);

>         }

>

> --

> 2.17.1

>
Rafael J. Wysocki July 19, 2018, 10:45 a.m. | #2
On Wednesday, July 18, 2018 6:44:22 AM CEST Viresh Kumar wrote:
> On 17-07-18, 22:48, Niklas Cassel wrote:

> > If of_nvmem_cell_get() fails due to probe deferal, we shouldn't print an

> > error message. Just be silent in this case.

> > 

> > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>

> > ---

> >  drivers/cpufreq/qcom-cpufreq-kryo.c | 5 +++--

> >  1 file changed, 3 insertions(+), 2 deletions(-)

> > 

> > diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c

> > index 29389accf3e9..b8d1e6875f16 100644

> > --- a/drivers/cpufreq/qcom-cpufreq-kryo.c

> > +++ b/drivers/cpufreq/qcom-cpufreq-kryo.c

> > @@ -109,8 +109,9 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)

> >  	speedbin_nvmem = of_nvmem_cell_get(np, NULL);

> >  	of_node_put(np);

> >  	if (IS_ERR(speedbin_nvmem)) {

> > -		dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",

> > -			PTR_ERR(speedbin_nvmem));

> > +		if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)

> > +			dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",

> > +				PTR_ERR(speedbin_nvmem));

> >  		return PTR_ERR(speedbin_nvmem);

> >  	}

> 

> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

> 

> 


Applied, thanks!

Patch

diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index 29389accf3e9..b8d1e6875f16 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -109,8 +109,9 @@  static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
 	speedbin_nvmem = of_nvmem_cell_get(np, NULL);
 	of_node_put(np);
 	if (IS_ERR(speedbin_nvmem)) {
-		dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",
-			PTR_ERR(speedbin_nvmem));
+		if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)
+			dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",
+				PTR_ERR(speedbin_nvmem));
 		return PTR_ERR(speedbin_nvmem);
 	}