[PATCH v2 10/16] iio: adc: max1027: Create a helper to configure the channels to scan

From: Miquel Raynal
Date: Thu Sep 02 2021 - 17:15:05 EST


These bits are meant to be reused for triggered buffers setup.

Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
---
drivers/iio/adc/max1027.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index 476b90f12330..f4cb5c75604b 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -257,6 +257,19 @@ struct max1027_state {
u8 reg ____cacheline_aligned;
};

+/* Scan from chan 0 to the highest requested channel. Include temperature on demand. */
+static int max1027_configure_chans_and_start(struct iio_dev *indio_dev)
+{
+ struct max1027_state *st = iio_priv(indio_dev);
+
+ st->reg = MAX1027_CONV_REG | MAX1027_SCAN_0_N;
+ st->reg |= MAX1027_CHAN(fls(*indio_dev->active_scan_mask) - 2);
+ if (*indio_dev->active_scan_mask & MAX1X27_SCAN_MASK_TEMP)
+ st->reg |= MAX1027_TEMP;
+
+ return spi_write(st->spi, &st->reg, 1);
+}
+
static int max1027_enable_trigger(struct iio_dev *indio_dev, bool enable)
{
struct max1027_state *st = iio_priv(indio_dev);
@@ -388,7 +401,6 @@ static int max1027_validate_trigger(struct iio_dev *indio_dev,
static int max1027_set_cnvst_trigger_state(struct iio_trigger *trig, bool state)
{
struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
- struct max1027_state *st = iio_priv(indio_dev);
int ret;

/*
@@ -402,17 +414,8 @@ static int max1027_set_cnvst_trigger_state(struct iio_trigger *trig, bool state)
return ret;

if (state) {
- /*
- * Scan from chan 0 to the highest requested channel.
- * Include temperature on demand.
- */
- st->reg = MAX1027_CONV_REG | MAX1027_SCAN_0_N;
- st->reg |= MAX1027_CHAN(fls(*indio_dev->active_scan_mask) - 2);
- if (*indio_dev->active_scan_mask & MAX1X27_SCAN_MASK_TEMP)
- st->reg |= MAX1027_TEMP;
-
- ret = spi_write(st->spi, &st->reg, 1);
- if (ret < 0)
+ ret = max1027_configure_chans_and_start(indio_dev);
+ if (ret)
return ret;
}

--
2.27.0