linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <aardelean@deviqon.com>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jonathan.Cameron@huawei.com, alexandru.tachici@analog.com,
	linux@deviqon.com
Subject: Re: [PATCH v4 04/12] iio: adc: ad7192: handle regulator voltage error first
Date: Thu, 13 May 2021 16:38:50 +0100	[thread overview]
Message-ID: <20210513163850.434d8994@jic23-huawei> (raw)
In-Reply-To: <20210513120752.90074-5-aardelean@deviqon.com>

On Thu, 13 May 2021 15:07:44 +0300
Alexandru Ardelean <aardelean@deviqon.com> wrote:

> This change fixes a corner-case, where for a zero regulator value, the
> driver would exit early, initializing the driver only partially.
> The driver would be in an unknown state.
> 
> This change reworks the code to check regulator_voltage() return value
> for negative (error) first, and return early. This is the more common
> idiom.
> 
> Also, this change is removing the 'voltage_uv' variable and using the 'ret'
> value directly. The only place where 'voltage_uv' is being used is to
> compute the internal reference voltage, and the type of this variable is
> 'int' (same are for 'ret'). Using only 'ret' avoids having to assign it on
> the error path.
> 
> Fixes: ab0afa65bbc7 ("staging: iio: adc: ad7192: fail probe on get_voltage")
> Cc: Alexandru Tachici <alexandru.tachici@analog.com>
> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>

I've applied the first 4 patches to the fixes-togreg branch of iio.git and
cc'd stable.

Added note to the first 3 about the sign-off chain as its a bit unusual
for it to include loops ;)  I always debate if I should sign-off again
when this happens, but decide against.

Jonathan

> ---
>  drivers/iio/adc/ad7192.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
> index d3be67aa0522..1141cc13a124 100644
> --- a/drivers/iio/adc/ad7192.c
> +++ b/drivers/iio/adc/ad7192.c
> @@ -912,7 +912,7 @@ static int ad7192_probe(struct spi_device *spi)
>  {
>  	struct ad7192_state *st;
>  	struct iio_dev *indio_dev;
> -	int ret, voltage_uv = 0;
> +	int ret;
>  
>  	if (!spi->irq) {
>  		dev_err(&spi->dev, "no IRQ?\n");
> @@ -949,15 +949,12 @@ static int ad7192_probe(struct spi_device *spi)
>  		goto error_disable_avdd;
>  	}
>  
> -	voltage_uv = regulator_get_voltage(st->avdd);
> -
> -	if (voltage_uv > 0) {
> -		st->int_vref_mv = voltage_uv / 1000;
> -	} else {
> -		ret = voltage_uv;
> +	ret = regulator_get_voltage(st->avdd);
> +	if (ret < 0) {
>  		dev_err(&spi->dev, "Device tree error, reference voltage undefined\n");
>  		goto error_disable_avdd;
>  	}
> +	st->int_vref_mv = ret / 1000;
>  
>  	spi_set_drvdata(spi, indio_dev);
>  	st->chip_info = of_device_get_match_data(&spi->dev);


  reply	other threads:[~2021-05-13 15:37 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-13 12:07 [PATCH v4 00/12] ad_sigma_delta: convert all drivers to device-managed Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 01/12] iio: adc: ad7124: Fix missbalanced regulator enable / disable on error Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 02/12] iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 03/12] iio: adc: ad7192: Avoid disabling a clock that was never enabled Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 04/12] iio: adc: ad7192: handle regulator voltage error first Alexandru Ardelean
2021-05-13 15:38   ` Jonathan Cameron [this message]
2021-05-13 12:07 ` [PATCH v4 05/12] iio: adc: ad_sigma_delta: introduct devm_ad_sd_setup_buffer_and_trigger() Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 06/12] iio: adc: ad7793: convert to device-managed functions Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 07/12] iio: adc: ad7791: " Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 08/12] iio: adc: ad7780: " Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 09/12] iio: adc: ad7192: use devm_clk_get_optional() for mclk Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 10/12] iio: adc: ad7192: convert to device-managed functions Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 11/12] iio: adc: ad7124: Use devm_ managed calls for all of probe() + drop remove() Alexandru Ardelean
2021-05-13 12:07 ` [PATCH v4 12/12] iio: adc: ad_sigma_delta: remove ad_sd_{setup,cleanup}_buffer_and_trigger() Alexandru Ardelean
2021-06-09 20:09 ` [PATCH v4 00/12] ad_sigma_delta: convert all drivers to device-managed Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210513163850.434d8994@jic23-huawei \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=aardelean@deviqon.com \
    --cc=alexandru.tachici@analog.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@deviqon.com \
    --subject='Re: [PATCH v4 04/12] iio: adc: ad7192: handle regulator voltage error first' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).