From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<eugen.hristev@microchip.com>, <ludovic.desroches@microchip.com>
Subject: Re: [PATCH v2 1/2] iio: at91-sama5d2_adc: split at91_adc_current_chan_is_touch() helper
Date: Mon, 13 Apr 2020 18:05:56 +0100 [thread overview]
Message-ID: <20200413180556.20638f3b@archlinux> (raw)
In-Reply-To: <20200304084219.20810-1-alexandru.ardelean@analog.com>
On Wed, 4 Mar 2020 10:42:18 +0200
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> This change moves the logic to check if the current channel is the
> touchscreen channel to a separate helper.
> This reduces some code duplication, but the main intent is to re-use this
> in the next patches.
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Eugen / Ludovic,
Have you had a chance to look at this series?
Thanks,
Jonathan
> ---
>
> This patchset continues discussion:
> https://lore.kernel.org/linux-iio/20191023082508.17583-1-alexandru.ardelean@analog.com/
> Apologies for the delay.
>
> Changelog v1 -> v2:
> * added patch 'iio: at91-sama5d2_adc: split at91_adc_current_chan_is_touch()
> helper'
> * renamed at91_adc_buffer_postenable() -> at91_adc_buffer_preenable()
> - at91_adc_buffer_postenable() - now just calls
> iio_triggered_buffer_postenable() if the channel isn't the touchscreen
> channel
> * renamed at91_adc_buffer_predisable() -> at91_adc_buffer_postdisable()
> - at91_adc_buffer_predisable() - now just calls
> iio_triggered_buffer_predisable() if the channel isn't the touchscreen
> channel
>
> drivers/iio/adc/at91-sama5d2_adc.c | 31 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index a5c7771227d5..f2a74c47c768 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -873,18 +873,24 @@ static int at91_adc_dma_start(struct iio_dev *indio_dev)
> return 0;
> }
>
> +static bool at91_adc_current_chan_is_touch(struct iio_dev *indio_dev)
> +{
> + struct at91_adc_state *st = iio_priv(indio_dev);
> +
> + return !!bitmap_subset(indio_dev->active_scan_mask,
> + &st->touch_st.channels_bitmask,
> + AT91_SAMA5D2_MAX_CHAN_IDX + 1);
> +}
> +
> static int at91_adc_buffer_postenable(struct iio_dev *indio_dev)
> {
> int ret;
> struct at91_adc_state *st = iio_priv(indio_dev);
>
> /* check if we are enabling triggered buffer or the touchscreen */
> - if (bitmap_subset(indio_dev->active_scan_mask,
> - &st->touch_st.channels_bitmask,
> - AT91_SAMA5D2_MAX_CHAN_IDX + 1)) {
> - /* touchscreen enabling */
> + if (at91_adc_current_chan_is_touch(indio_dev))
> return at91_adc_configure_touch(st, true);
> - }
> +
> /* if we are not in triggered mode, we cannot enable the buffer. */
> if (!(indio_dev->currentmode & INDIO_ALL_TRIGGERED_MODES))
> return -EINVAL;
> @@ -906,12 +912,9 @@ static int at91_adc_buffer_predisable(struct iio_dev *indio_dev)
> u8 bit;
>
> /* check if we are disabling triggered buffer or the touchscreen */
> - if (bitmap_subset(indio_dev->active_scan_mask,
> - &st->touch_st.channels_bitmask,
> - AT91_SAMA5D2_MAX_CHAN_IDX + 1)) {
> - /* touchscreen disable */
> + if (at91_adc_current_chan_is_touch(indio_dev))
> return at91_adc_configure_touch(st, false);
> - }
> +
> /* if we are not in triggered mode, nothing to do here */
> if (!(indio_dev->currentmode & INDIO_ALL_TRIGGERED_MODES))
> return -EINVAL;
> @@ -1886,14 +1889,10 @@ static __maybe_unused int at91_adc_resume(struct device *dev)
> return 0;
>
> /* check if we are enabling triggered buffer or the touchscreen */
> - if (bitmap_subset(indio_dev->active_scan_mask,
> - &st->touch_st.channels_bitmask,
> - AT91_SAMA5D2_MAX_CHAN_IDX + 1)) {
> - /* touchscreen enabling */
> + if (at91_adc_current_chan_is_touch(indio_dev))
> return at91_adc_configure_touch(st, true);
> - } else {
> + else
> return at91_adc_configure_trigger(st->trig, true);
> - }
>
> /* not needed but more explicit */
> return 0;
next prev parent reply other threads:[~2020-04-13 17:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-04 8:42 [PATCH v2 1/2] iio: at91-sama5d2_adc: split at91_adc_current_chan_is_touch() helper Alexandru Ardelean
2020-03-04 8:42 ` [PATCH v2 2/2] iio: at91-sama5d2_adc: adjust iio_triggered_buffer_{predisable,postenable} positions Alexandru Ardelean
2020-04-19 10:04 ` ludovic.desroches
2020-04-23 10:56 ` Eugen.Hristev
2020-04-13 17:05 ` Jonathan Cameron [this message]
2020-04-14 12:22 ` [PATCH v2 1/2] iio: at91-sama5d2_adc: split at91_adc_current_chan_is_touch() helper Eugen.Hristev
2020-04-14 17:45 ` Jonathan Cameron
2020-04-15 6:33 ` Ardelean, Alexandru
2020-04-27 12:20 ` Eugen.Hristev
2020-04-27 13:00 ` Ardelean, Alexandru
2020-04-30 7:30 ` Ardelean, Alexandru
2020-04-30 8:10 ` Ardelean, Alexandru
2020-05-02 17:31 ` Jonathan Cameron
2020-04-15 6:43 ` ludovic.desroches
2020-04-18 17:58 ` Jonathan Cameron
2020-04-19 10:09 ` ludovic.desroches
2020-04-25 15:06 ` 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=20200413180556.20638f3b@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.ardelean@analog.com \
--cc=eugen.hristev@microchip.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
/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).