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 2/4] iio:gyro: preenable/postenable/predisable fixup for ST gyro buffer
Date: Thu, 1 Aug 2019 08:22:00 +0000 [thread overview]
Message-ID: <f1d17225c26696b6f311e5b412fe3ebdac124b03.camel@analog.com> (raw)
In-Reply-To: <20190731214900.15380-3-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.
> There is no need of using preenable, all can be done into
> postenable. Let's also use logical sequence of operations as
> already done in accel driver.
> Finally also 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/gyro/st_gyro_buffer.c | 49 +++++++++++++++----------------
> 1 file changed, 24 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c
> index 21360681d4dd..c6ddfecc1fc3 100644
> --- a/drivers/iio/gyro/st_gyro_buffer.c
> +++ b/drivers/iio/gyro/st_gyro_buffer.c
> @@ -29,62 +29,61 @@ int st_gyro_trig_set_state(struct iio_trigger *trig, bool state)
> return st_sensors_set_dataready_irq(indio_dev, state);
> }
>
> -static int st_gyro_buffer_preenable(struct iio_dev *indio_dev)
> -{
> - return st_sensors_set_enable(indio_dev, true);
> -}
> -
> static int st_gyro_buffer_postenable(struct iio_dev *indio_dev)
> {
> - int err;
> struct st_sensor_data *gdata = iio_priv(indio_dev);
> + int err;
>
> gdata->buffer_data = kmalloc(indio_dev->scan_bytes,
> GFP_DMA | GFP_KERNEL);
> - if (gdata->buffer_data == NULL) {
> - err = -ENOMEM;
> - goto allocate_memory_error;
> - }
> + if (!gdata->buffer_data)
> + return -ENOMEM;
> +
> + err = iio_triggered_buffer_postenable(indio_dev);
> + if (err < 0)
> + goto st_gyro_free_buffer;
>
> err = st_sensors_set_axis_enable(indio_dev,
> - (u8)indio_dev->active_scan_mask[0]);
> + (u8)indio_dev->active_scan_mask[0]);
> if (err < 0)
> - goto st_gyro_buffer_postenable_error;
> + goto st_gyro_buffer_predisable;
>
> - err = iio_triggered_buffer_postenable(indio_dev);
> + err = st_sensors_set_enable(indio_dev, true);
> if (err < 0)
> - goto st_gyro_buffer_postenable_error;
> + goto st_gyro_buffer_enable_all_axis;
>
> - return err;
> + return 0;
>
> -st_gyro_buffer_postenable_error:
> +st_gyro_buffer_enable_all_axis:
> + st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
> +st_gyro_buffer_predisable:
> + iio_triggered_buffer_predisable(indio_dev);
> +st_gyro_free_buffer:
> kfree(gdata->buffer_data);
> -allocate_memory_error:
> return err;
> }
>
> static int st_gyro_buffer_predisable(struct iio_dev *indio_dev)
> {
> - int err;
> + int err, err2;
> struct st_sensor_data *gdata = iio_priv(indio_dev);
>
> - err = iio_triggered_buffer_predisable(indio_dev);
> + err = st_sensors_set_enable(indio_dev, false);
> if (err < 0)
> - goto st_gyro_buffer_predisable_error;
> + goto st_gyro_buffer_predisable;
>
> err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
> - if (err < 0)
> - goto st_gyro_buffer_predisable_error;
>
> - err = st_sensors_set_enable(indio_dev, false);
> +st_gyro_buffer_predisable:
> + err2 = iio_triggered_buffer_predisable(indio_dev);
> + if (!err)
> + err = err2;
>
> -st_gyro_buffer_predisable_error:
> kfree(gdata->buffer_data);
> return err;
> }
>
> static const struct iio_buffer_setup_ops st_gyro_buffer_setup_ops = {
> - .preenable = &st_gyro_buffer_preenable,
> .postenable = &st_gyro_buffer_postenable,
> .predisable = &st_gyro_buffer_predisable,
> };
next prev parent reply other threads:[~2019-08-01 8:22 UTC|newest]
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 [this message]
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
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 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=f1d17225c26696b6f311e5b412fe3ebdac124b03.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).