diff mbox series

thermal: qcom-spmi-adc5: Suppress probe-deferral error message

Message ID 20221216190945.902754-1-marijn.suijten@somainline.org
State Accepted
Commit 04104842736fb29d2e1b5c71dd93f87f428506f0
Headers show
Series thermal: qcom-spmi-adc5: Suppress probe-deferral error message | expand

Commit Message

Marijn Suijten Dec. 16, 2022, 7:09 p.m. UTC
Much like 807efb7102e8 ("thermal: qcom-spmi-adc-tm5: suppress
probe-deferral error message") the ADC5 driver also spams a similar
probe-deferral error on startup when a channel is not yet available:

    [    0.343136] qcom-spmi-adc-tm5 1c40000.spmi:pmic@0:adc-tm@3500: get dt data failed: -517

Suppress it by using dev_err_probe instead, which also takes care of
storing the message as reason for deferring.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
---
 drivers/iio/adc/qcom-spmi-adc5.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Martin Botka Dec. 18, 2022, 11:13 a.m. UTC | #1
On Fri, Dec 16 2022 at 08:09:45 PM +01:00:00, Marijn Suijten 
<marijn.suijten@somainline.org> wrote:
> Much like 807efb7102e8 ("thermal: qcom-spmi-adc-tm5: suppress
> probe-deferral error message") the ADC5 driver also spams a similar
> probe-deferral error on startup when a channel is not yet available:
> 
>     [    0.343136] qcom-spmi-adc-tm5 1c40000.spmi:pmic@0:adc-tm@3500: 
> get dt data failed: -517
> 
> Suppress it by using dev_err_probe instead, which also takes care of
> storing the message as reason for deferring.
> 
> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
> ---
>  drivers/iio/adc/qcom-spmi-adc5.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/iio/adc/qcom-spmi-adc5.c 
> b/drivers/iio/adc/qcom-spmi-adc5.c
> index 821fee60a765..69cc36004b5a 100644
> --- a/drivers/iio/adc/qcom-spmi-adc5.c
> +++ b/drivers/iio/adc/qcom-spmi-adc5.c
> @@ -894,10 +894,8 @@ static int adc5_probe(struct platform_device 
> *pdev)
>  	mutex_init(&adc->lock);
> 
>  	ret = adc5_get_fw_data(adc);
> -	if (ret) {
> -		dev_err(dev, "adc get dt data failed\n");
> -		return ret;
> -	}
> +	if (ret)
> +		return dev_err_probe(dev, ret, "adc get dt data failed\n");
> 
Reviewed-by: Martin Botka <martin.botka@somainline.org>

-Martin
>  	irq_eoc = platform_get_irq(pdev, 0);
>  	if (irq_eoc < 0) {
> --
> 2.39.0
>
Jonathan Cameron Dec. 23, 2022, 3:14 p.m. UTC | #2
On Sat, 17 Dec 2022 00:42:12 +0100
Marijn Suijten <marijn.suijten@somainline.org> wrote:

> Whoops, that tile must of course have started with:
> 
>     iio: adc: qcom-spmi-adc5:
> 
> instead of blindly copying the suffix from the thermal monitor patch
> (this driver is not a thermal monitor...).  I'll send a v2 if there are
> no other objections, unless this can be fixed up when the patch is
> applied.
Fixed up whilst applying.

Applied to the togreg branch of iio.git, but only pushed out as testing for
now as I want to rebase the branch on rc1 once available.

Jonathan

> 
> On 2022-12-16 20:09:45, Marijn Suijten wrote:
> > Much like 807efb7102e8 ("thermal: qcom-spmi-adc-tm5: suppress
> > probe-deferral error message") the ADC5 driver also spams a similar
> > probe-deferral error on startup when a channel is not yet available:
> > 
> >     [    0.343136] qcom-spmi-adc-tm5 1c40000.spmi:pmic@0:adc-tm@3500: get dt data failed: -517
> > 
> > Suppress it by using dev_err_probe instead, which also takes care of
> > storing the message as reason for deferring.
> > 
> > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
> > ---
> >  drivers/iio/adc/qcom-spmi-adc5.c | 6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
> > index 821fee60a765..69cc36004b5a 100644
> > --- a/drivers/iio/adc/qcom-spmi-adc5.c
> > +++ b/drivers/iio/adc/qcom-spmi-adc5.c
> > @@ -894,10 +894,8 @@ static int adc5_probe(struct platform_device *pdev)
> >  	mutex_init(&adc->lock);
> >  
> >  	ret = adc5_get_fw_data(adc);
> > -	if (ret) {
> > -		dev_err(dev, "adc get dt data failed\n");
> > -		return ret;
> > -	}
> > +	if (ret)
> > +		return dev_err_probe(dev, ret, "adc get dt data failed\n");
> >  
> >  	irq_eoc = platform_get_irq(pdev, 0);
> >  	if (irq_eoc < 0) {
> > -- 
> > 2.39.0
> >   
> 
> Apologies for the clumsiness.
> 
> - Marijn
diff mbox series

Patch

diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
index 821fee60a765..69cc36004b5a 100644
--- a/drivers/iio/adc/qcom-spmi-adc5.c
+++ b/drivers/iio/adc/qcom-spmi-adc5.c
@@ -894,10 +894,8 @@  static int adc5_probe(struct platform_device *pdev)
 	mutex_init(&adc->lock);
 
 	ret = adc5_get_fw_data(adc);
-	if (ret) {
-		dev_err(dev, "adc get dt data failed\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "adc get dt data failed\n");
 
 	irq_eoc = platform_get_irq(pdev, 0);
 	if (irq_eoc < 0) {