From: Jonathan Cameron <jic23@jic23.retrosnub.co.uk>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: <linux-iio@vger.kernel.org>, <pmeerw@pmeerw.net>
Subject: Re: [PATCH] iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions
Date: Sat, 8 Jun 2019 15:24:03 +0100 [thread overview]
Message-ID: <20190608152403.00bc86d7@archlinux> (raw)
In-Reply-To: <20190529142040.7993-1-alexandru.ardelean@analog.com>
On Wed, 29 May 2019 17:20:40 +0300
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> The iio_triggered_buffer_{predisable,postenable} functions attach/detach
> the poll functions.
>
> For the predisable hook, the disable code should occur before detaching
> the poll func, and for the postenable hook, the poll func should be
> attached before the enable code.
>
> The driver was slightly reworked. The preenable hook was moved to the
> postenable, to add some symmetry to the postenable/predisable part.
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Looks fine to me, but I'm looking for a tested-by/ack from Peter.
Thanks,
Jonathan
> ---
> drivers/iio/light/tcs3414.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
> index 205e5659ce6b..ae70bf89be70 100644
> --- a/drivers/iio/light/tcs3414.c
> +++ b/drivers/iio/light/tcs3414.c
> @@ -243,32 +243,42 @@ static const struct iio_info tcs3414_info = {
> .attrs = &tcs3414_attribute_group,
> };
>
> -static int tcs3414_buffer_preenable(struct iio_dev *indio_dev)
> +static int tcs3414_buffer_postenable(struct iio_dev *indio_dev)
> {
> struct tcs3414_data *data = iio_priv(indio_dev);
> + int ret;
> +
> + ret = iio_triggered_buffer_postenable(indio_dev);
> + if (ret)
> + return ret;
>
> data->control |= TCS3414_CONTROL_ADC_EN;
> - return i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL,
> + ret = i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL,
> data->control);
> + if (ret)
> + iio_triggered_buffer_predisable(indio_dev);
> +
> + return ret;
> }
>
> static int tcs3414_buffer_predisable(struct iio_dev *indio_dev)
> {
> struct tcs3414_data *data = iio_priv(indio_dev);
> - int ret;
> -
> - ret = iio_triggered_buffer_predisable(indio_dev);
> - if (ret < 0)
> - return ret;
> + int ret, ret2;
>
> data->control &= ~TCS3414_CONTROL_ADC_EN;
> - return i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL,
> + ret = i2c_smbus_write_byte_data(data->client, TCS3414_CONTROL,
> data->control);
> +
> + ret2 = iio_triggered_buffer_predisable(indio_dev);
> + if (!ret)
> + ret = ret2;
> +
> + return ret;
> }
>
> static const struct iio_buffer_setup_ops tcs3414_buffer_setup_ops = {
> - .preenable = tcs3414_buffer_preenable,
> - .postenable = &iio_triggered_buffer_postenable,
> + .postenable = tcs3414_buffer_postenable,
> .predisable = tcs3414_buffer_predisable,
> };
>
next prev parent reply other threads:[~2019-06-08 14:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 14:20 [PATCH] iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions Alexandru Ardelean
2019-06-08 14:24 ` Jonathan Cameron [this message]
2019-09-20 7:57 ` [PATCH][RESEND] " Alexandru Ardelean
2019-09-21 15:32 ` 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=20190608152403.00bc86d7@archlinux \
--to=jic23@jic23.retrosnub.co.uk \
--cc=alexandru.ardelean@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/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).