Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756260AbcKEQVw (ORCPT ); Sat, 5 Nov 2016 12:21:52 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:50935 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755801AbcKEQVv (ORCPT ); Sat, 5 Nov 2016 12:21:51 -0400 Subject: Re: [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd' To: Eva Rachel Retuya , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org References: <1477933475-21914-1-git-send-email-eraretuya@gmail.com> <1477933475-21914-5-git-send-email-eraretuya@gmail.com> Cc: lars@metafoo.de, Michael.Hennerich@analog.com, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org From: Jonathan Cameron Message-ID: <7e37b172-5662-c89a-6fb6-3d891a0f833f@kernel.org> Date: Sat, 5 Nov 2016 16:21:49 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1477933475-21914-5-git-send-email-eraretuya@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2456 Lines: 84 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 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; > } >