Linux-IIO Archive on lore.kernel.org
 help / color / Atom feed
From: "Ardelean, Alexandru" <alexandru.Ardelean@analog.com>
To: "jic23@kernel.org" <jic23@kernel.org>,
	"denis.ciocca@st.com" <denis.ciocca@st.com>,
	"linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: [PATCH v2 3/4] iio:magn: preenable/postenable/predisable fixup for ST magn buffer
Date: Thu, 1 Aug 2019 08:22:07 +0000
Message-ID: <7afb7f9115903663a4da41add9b4d8419ef981ec.camel@analog.com> (raw)
In-Reply-To: <20190731214900.15380-4-denis.ciocca@st.com>

On Wed, 2019-07-31 at 14:48 -0700, Denis Ciocca wrote:
> [External]
> 
> This patch is trying to cleanup for good the buffers operation functions.
> Let's rename the goto label using operation to perform and not
> where it fails.
> 

Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com>

> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
> ---
>  drivers/iio/magnetometer/st_magn_buffer.c | 30 ++++++++++++-----------
>  1 file changed, 16 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
> index 9dba93539a99..658d627dad8e 100644
> --- a/drivers/iio/magnetometer/st_magn_buffer.c
> +++ b/drivers/iio/magnetometer/st_magn_buffer.c
> @@ -31,40 +31,42 @@ int st_magn_trig_set_state(struct iio_trigger *trig, bool state)
>  
>  static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
>  {
> -	int err;
>  	struct st_sensor_data *mdata = iio_priv(indio_dev);
> +	int err;
>  
>  	mdata->buffer_data = kmalloc(indio_dev->scan_bytes,
>  				     GFP_DMA | GFP_KERNEL);
> -	if (mdata->buffer_data == NULL) {
> -		err = -ENOMEM;
> -		goto allocate_memory_error;
> -	}
> +	if (!mdata->buffer_data)
> +		return -ENOMEM;
>  
>  	err = iio_triggered_buffer_postenable(indio_dev);
>  	if (err < 0)
> -		goto st_magn_buffer_postenable_error;
> +		goto st_magn_free_buffer;
> +
> +	err = st_sensors_set_enable(indio_dev, true);
> +	if (err < 0)
> +		goto st_magn_buffer_predisable;
>  
> -	return st_sensors_set_enable(indio_dev, true);
> +	return 0;
>  
> -st_magn_buffer_postenable_error:
> +st_magn_buffer_predisable:
> +	iio_triggered_buffer_predisable(indio_dev);
> +st_magn_free_buffer:
>  	kfree(mdata->buffer_data);
> -allocate_memory_error:
>  	return err;
>  }
>  
>  static int st_magn_buffer_predisable(struct iio_dev *indio_dev)
>  {
> -	int err;
>  	struct st_sensor_data *mdata = iio_priv(indio_dev);
> +	int err, err2;
>  
>  	err = st_sensors_set_enable(indio_dev, false);
> -	if (err < 0)
> -		goto st_magn_buffer_predisable_error;
>  
> -	err = iio_triggered_buffer_predisable(indio_dev);
> +	err2 = iio_triggered_buffer_predisable(indio_dev);
> +	if (!err)
> +		err = err2;
>  
> -st_magn_buffer_predisable_error:
>  	kfree(mdata->buffer_data);
>  	return err;
>  }

  reply index

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-31 21:48 [PATCH v2 0/4] preenable/postenable/predisable fixup for ST drivers Denis Ciocca
2019-07-31 21:48 ` [PATCH v2 1/4] iio:accel: preenable/postenable/predisable fixup for ST accel buffer Denis Ciocca
2019-08-01  8:21   ` Ardelean, Alexandru
2019-08-05 14:46     ` Jonathan Cameron
2019-07-31 21:48 ` [PATCH v2 2/4] iio:gyro: preenable/postenable/predisable fixup for ST gyro buffer Denis Ciocca
2019-08-01  8:22   ` Ardelean, Alexandru
2019-08-05 14:46     ` Jonathan Cameron
2019-07-31 21:48 ` [PATCH v2 3/4] iio:magn: preenable/postenable/predisable fixup for ST magn buffer Denis Ciocca
2019-08-01  8:22   ` Ardelean, Alexandru [this message]
2019-08-05 14:47     ` Jonathan Cameron
2019-07-31 21:49 ` [PATCH v2 4/4] iio:pressure: preenable/postenable/predisable fixup for ST press buffer Denis Ciocca
2019-08-01  8:22   ` Ardelean, Alexandru
2019-08-05 14:49     ` Jonathan Cameron

Reply instructions:

You may reply publically 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=7afb7f9115903663a4da41add9b4d8419ef981ec.camel@analog.com \
    --to=alexandru.ardelean@analog.com \
    --cc=denis.ciocca@st.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    /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

Linux-IIO Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-iio/0 linux-iio/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-iio linux-iio/ https://lore.kernel.org/linux-iio \
		linux-iio@vger.kernel.org linux-iio@archiver.kernel.org
	public-inbox-index linux-iio


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-iio


AGPL code for this site: git clone https://public-inbox.org/ public-inbox