Commit 502966c3 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Jonathan Cameron

iio: adc: at91-sama5d2_adc: move the check of oversampling in its function

Oversampling values are checked anyway in at91_adc_emr_config(). Remove
the checking of these from at91_adc_write_raw() and return -EINVAL
instead in at91_adc_emr_config().
Suggested-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220803102855.2191070-8-claudiu.beznea@microchip.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 287c271d
...@@ -728,7 +728,7 @@ static void at91_adc_eoc_ena(struct at91_adc_state *st, unsigned int channel) ...@@ -728,7 +728,7 @@ static void at91_adc_eoc_ena(struct at91_adc_state *st, unsigned int channel)
at91_adc_writel(st, EOC_IER, BIT(channel)); at91_adc_writel(st, EOC_IER, BIT(channel));
} }
static void at91_adc_config_emr(struct at91_adc_state *st, static int at91_adc_config_emr(struct at91_adc_state *st,
u32 oversampling_ratio) u32 oversampling_ratio)
{ {
/* configure the extended mode register */ /* configure the extended mode register */
...@@ -755,9 +755,13 @@ static void at91_adc_config_emr(struct at91_adc_state *st, ...@@ -755,9 +755,13 @@ static void at91_adc_config_emr(struct at91_adc_state *st,
emr |= AT91_SAMA5D2_EMR_OSR(AT91_SAMA5D2_EMR_OSR_16SAMPLES, emr |= AT91_SAMA5D2_EMR_OSR(AT91_SAMA5D2_EMR_OSR_16SAMPLES,
osr_mask); osr_mask);
break; break;
default:
return -EINVAL;
} }
at91_adc_writel(st, EMR, emr); at91_adc_writel(st, EMR, emr);
return 0;
} }
static int at91_adc_adjust_val_osr(struct at91_adc_state *st, int *val) static int at91_adc_adjust_val_osr(struct at91_adc_state *st, int *val)
...@@ -1650,9 +1654,6 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev, ...@@ -1650,9 +1654,6 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev,
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_OVERSAMPLING_RATIO: case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
if ((val != AT91_OSR_1SAMPLES) && (val != AT91_OSR_4SAMPLES) &&
(val != AT91_OSR_16SAMPLES))
return -EINVAL;
/* if no change, optimize out */ /* if no change, optimize out */
if (val == st->oversampling_ratio) if (val == st->oversampling_ratio)
return 0; return 0;
...@@ -1661,12 +1662,13 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev, ...@@ -1661,12 +1662,13 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev,
if (ret) if (ret)
return ret; return ret;
mutex_lock(&st->lock); mutex_lock(&st->lock);
st->oversampling_ratio = val;
/* update ratio */ /* update ratio */
at91_adc_config_emr(st, val); ret = at91_adc_config_emr(st, val);
if (!ret)
st->oversampling_ratio = val;
mutex_unlock(&st->lock); mutex_unlock(&st->lock);
iio_device_release_direct_mode(indio_dev); iio_device_release_direct_mode(indio_dev);
return 0; return ret;
case IIO_CHAN_INFO_SAMP_FREQ: case IIO_CHAN_INFO_SAMP_FREQ:
if (val < st->soc_info.min_sample_rate || if (val < st->soc_info.min_sample_rate ||
val > st->soc_info.max_sample_rate) val > st->soc_info.max_sample_rate)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment