niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

iio: at91-sama5d2_adc: split at91_adc_current_chan_is_touch() helper

Browse source 
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>
Reviewed-by: Eugen Hristev <eugen.hristev@microchip.com>
Reviewed-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Alexandru Ardelean 2020-03-04 10:42:18 +02:00 • committed by Jonathan Cameron
parent abb7e84d29
commit 065056cb0d
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/iio/adc/at91-sama5d2_adc.c
View file

@ -874,6 +874,15 @@ static bool at91_adc_buffer_check_use_irq(struct iio_dev *indio,
return true; return true;
} }
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) static int at91_adc_buffer_postenable(struct iio_dev *indio_dev)
{ {
int ret; int ret;
@ -881,12 +890,9 @@ static int at91_adc_buffer_postenable(struct iio_dev *indio_dev)
struct at91_adc_state *st = iio_priv(indio_dev); struct at91_adc_state *st = iio_priv(indio_dev);
/* check if we are enabling triggered buffer or the touchscreen */ /* check if we are enabling triggered buffer or the touchscreen */
if (bitmap_subset(indio_dev->active_scan_mask, if (at91_adc_current_chan_is_touch(indio_dev))
&st->touch_st.channels_bitmask,
AT91_SAMA5D2_MAX_CHAN_IDX + 1)) {
/* touchscreen enabling */
return at91_adc_configure_touch(st, true); return at91_adc_configure_touch(st, true);
}
/* if we are not in triggered mode, we cannot enable the buffer. */ /* if we are not in triggered mode, we cannot enable the buffer. */
if (!(indio_dev->currentmode & INDIO_ALL_TRIGGERED_MODES)) if (!(indio_dev->currentmode & INDIO_ALL_TRIGGERED_MODES))
return -EINVAL; return -EINVAL;
@ -938,12 +944,9 @@ static int at91_adc_buffer_predisable(struct iio_dev *indio_dev)
u8 bit; u8 bit;
/* check if we are disabling triggered buffer or the touchscreen */ /* check if we are disabling triggered buffer or the touchscreen */
if (bitmap_subset(indio_dev->active_scan_mask, if (at91_adc_current_chan_is_touch(indio_dev))
&st->touch_st.channels_bitmask,
AT91_SAMA5D2_MAX_CHAN_IDX + 1)) {
/* touchscreen disable */
return at91_adc_configure_touch(st, false); return at91_adc_configure_touch(st, false);
}
/* if we are not in triggered mode, nothing to do here */ /* if we are not in triggered mode, nothing to do here */
if (!(indio_dev->currentmode & INDIO_ALL_TRIGGERED_MODES)) if (!(indio_dev->currentmode & INDIO_ALL_TRIGGERED_MODES))
return -EINVAL; return -EINVAL;
@ -1937,14 +1940,10 @@ static __maybe_unused int at91_adc_resume(struct device *dev)
return 0; return 0;
/* check if we are enabling triggered buffer or the touchscreen */ /* check if we are enabling triggered buffer or the touchscreen */
if (bitmap_subset(indio_dev->active_scan_mask, if (at91_adc_current_chan_is_touch(indio_dev))
&st->touch_st.channels_bitmask,
AT91_SAMA5D2_MAX_CHAN_IDX + 1)) {
/* touchscreen enabling */
return at91_adc_configure_touch(st, true); return at91_adc_configure_touch(st, true);
} else { else
return at91_adc_configure_trigger(st->trig, true); return at91_adc_configure_trigger(st->trig, true);
}
/* not needed but more explicit */ /* not needed but more explicit */
return 0; return 0;