Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1515584

Re: [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd'

Show all headers | View raw

On 31/10/16 17:04, Eva Rachel Retuya wrote:
> Rename regulator 'reg' to 'avdd' so as to be clear what regulator it
> stands for specifically. Also, update the goto label accordingly.
> 
> Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
Applied.

Thanks,

Jonathan
> ---
>  drivers/staging/iio/adc/ad7192.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
> index 3f8dc66..1fb68c0 100644
> --- a/drivers/staging/iio/adc/ad7192.c
> +++ b/drivers/staging/iio/adc/ad7192.c
> @@ -152,7 +152,7 @@
>   */
>  
>  struct ad7192_state {
> -	struct regulator		*reg;
> +	struct regulator		*avdd;
>  	struct regulator		*dvdd;
>  	u16				int_vref_mv;
>  	u32				mclk;
> @@ -634,11 +634,11 @@ static int ad7192_probe(struct spi_device *spi)
>  
>  	st = iio_priv(indio_dev);
>  
> -	st->reg = devm_regulator_get(&spi->dev, "avdd");
> -	if (IS_ERR(st->reg))
> -		return PTR_ERR(st->reg);
> +	st->avdd = devm_regulator_get(&spi->dev, "avdd");
> +	if (IS_ERR(st->avdd))
> +		return PTR_ERR(st->avdd);
>  
> -	ret = regulator_enable(st->reg);
> +	ret = regulator_enable(st->avdd);
>  	if (ret) {
>  		dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
>  		return ret;
> @@ -647,16 +647,16 @@ static int ad7192_probe(struct spi_device *spi)
>  	st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
>  	if (IS_ERR(st->dvdd)) {
>  		ret = PTR_ERR(st->dvdd);
> -		goto error_disable_reg;
> +		goto error_disable_avdd;
>  	}
>  
>  	ret = regulator_enable(st->dvdd);
>  	if (ret) {
>  		dev_err(&spi->dev, "Failed to enable specified DVdd supply\n");
> -		goto error_disable_reg;
> +		goto error_disable_avdd;
>  	}
>  
> -	voltage_uv = regulator_get_voltage(st->reg);
> +	voltage_uv = regulator_get_voltage(st->avdd);
>  
>  	if (pdata->vref_mv)
>  		st->int_vref_mv = pdata->vref_mv;
> @@ -706,8 +706,8 @@ static int ad7192_probe(struct spi_device *spi)
>  	ad_sd_cleanup_buffer_and_trigger(indio_dev);
>  error_disable_dvdd:
>  	regulator_disable(st->dvdd);
> -error_disable_reg:
> -	regulator_disable(st->reg);
> +error_disable_avdd:
> +	regulator_disable(st->avdd);
>  
>  	return ret;
>  }
> @@ -721,7 +721,7 @@ static int ad7192_remove(struct spi_device *spi)
>  	ad_sd_cleanup_buffer_and_trigger(indio_dev);
>  
>  	regulator_disable(st->dvdd);
> -	regulator_disable(st->reg);
> +	regulator_disable(st->avdd);
>  
>  	return 0;
>  }
> 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] staging: iio: regulator clean-up Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
  [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd' Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to  'avdd' Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:30 +0100
  [PATCH 1/6] staging: iio: set proper supply name to devm_regulator_get() Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 1/6] staging: iio: set proper supply name to devm_regulator_get() Matt Ranostay <matt@ranostay.consulting> - 2016-11-01 05:10 +0100
      Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Lars-Peter Clausen <lars@metafoo.de> - 2016-11-01 21:00 +0100
        Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Jonathan Cameron <jic23@kernel.org> - 2016-11-05 14:00 +0100
          Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100
      Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Eva Rachel Retuya <eraretuya@gmail.com> - 2016-11-04 11:20 +0100
    Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100
  [PATCH 6/6] staging: iio: ad9832: clean-up regulator 'reg' Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 6/6] staging: iio: ad9832: clean-up regulator 'reg' Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:30 +0100
  [PATCH 2/6] staging: iio: rework regulator handling Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 2/6] staging: iio: rework regulator handling Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100
  [PATCH 5/6] staging: iio: ad9832: add DVDD regulator Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 5/6] staging: iio: ad9832: add DVDD regulator Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:30 +0100
  [PATCH 3/6] staging: iio: ad7192: add DVdd regulator Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 3/6] staging: iio: ad7192: add DVdd regulator Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100

csiph-web