[PATCH 07/16] iio: adc: at91-sama5d2_adc: simplify the code in at91_adc_read_info_raw()

Claudiu Beznea
2022-06-09T08:30:39Z

Simplify a bit the code in at91_adc_read_info_raw() by reducing the
number of lines of code.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/iio/adc/at91-sama5d2_adc.c | 35 +++++++++---------------------
1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index b52f1020feaf..fbb98e216e70 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -1576,6 +1576,7 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, int *val)
{
struct at91_adc_state *st = iio_priv(indio_dev);
+ int (*fn)(struct at91_adc_state *, int, u16 *) = NULL;
u16 tmp_val;
int ret;

@@ -1583,29 +1584,18 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev,
* Keep in mind that we cannot use software trigger or touchscreen
* if external trigger is enabled
*/
- if (chan->type == IIO_POSITIONRELATIVE) {
- ret = iio_device_claim_direct_mode(indio_dev);
- if (ret)
- return ret;
- mutex_lock(&st->lock);
-
- ret = at91_adc_read_position(st, chan->channel,
- &tmp_val);
- *val = tmp_val;
- ret = at91_adc_adjust_val_osr(st, val);
- mutex_unlock(&st->lock);
- iio_device_release_direct_mode(indio_dev);
+ if (chan->type == IIO_POSITIONRELATIVE)
+ fn = at91_adc_read_position;
+ if (chan->type == IIO_PRESSURE)
+ fn = at91_adc_read_pressure;

+ ret = iio_device_claim_direct_mode(indio_dev);
+ if (ret)
return ret;
- }
- if (chan->type == IIO_PRESSURE) {
- ret = iio_device_claim_direct_mode(indio_dev);
- if (ret)
- return ret;
- mutex_lock(&st->lock);
+ mutex_lock(&st->lock);

- ret = at91_adc_read_pressure(st, chan->channel,
- &tmp_val);
+ if (fn) {
+ ret = fn(st, chan->channel, &tmp_val);
*val = tmp_val;
ret = at91_adc_adjust_val_osr(st, val);
mutex_unlock(&st->lock);
@@ -1616,11 +1606,6 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev,

/* in this case we have a voltage channel */

- ret = iio_device_claim_direct_mode(indio_dev);
- if (ret)
- return ret;
- mutex_lock(&st->lock);
-
st->chan = chan;

at91_adc_cor(st, chan);
--
2.34.1