[PATCH v3 2/2] iio: light: adux1020: return early on unsupported channel types

From: Raffaele Tranfaglia via B4 Relay

Date: Wed Nov 18 2026 - 02:30:05 EST


From: Raffaele Tranfaglia <raffaele.tranfaglia@xxxxxxxxx>

Now that adux1020_read_raw() and adux1020_write_raw() can return
directly, check the channel type with an inverted condition and return
-EINVAL early instead of nesting the work in an inner switch or if
block. This removes one level of indentation and makes the two
functions consistent with each other.

While at it, add a local regmap pointer in adux1020_read_raw() and
adux1020_write_raw() to shorten the regmap calls, check the return
value of regmap_read() with 'if (ret)' since regmap only returns 0 or a
negative error code, and drop the stray semicolon after the closing
brace of adux1020_read_raw().

No functional change intended.

Suggested-by: Jonathan Cameron <jic23@xxxxxxxxxx>
Signed-off-by: Raffaele Tranfaglia <raffaele.tranfaglia@xxxxxxxxx>
---
drivers/iio/light/adux1020.c | 131 ++++++++++++++++++++-----------------------
1 file changed, 61 insertions(+), 70 deletions(-)

diff --git a/drivers/iio/light/adux1020.c b/drivers/iio/light/adux1020.c
index b595faf4abc5..5ee1994b6e50 100644
--- a/drivers/iio/light/adux1020.c
+++ b/drivers/iio/light/adux1020.c
@@ -362,6 +362,7 @@ static int adux1020_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long mask)
{
struct adux1020_data *data = iio_priv(indio_dev);
+ struct regmap *map = data->regmap;
u16 buf[3];
unsigned int regval;
int ret;
@@ -370,61 +371,54 @@ static int adux1020_read_raw(struct iio_dev *indio_dev,

switch (mask) {
case IIO_CHAN_INFO_RAW:
- switch (chan->type) {
- case IIO_PROXIMITY:
- ret = adux1020_set_mode(data, ADUX1020_MODE_PROX_I);
- if (ret < 0)
- return ret;
-
- ret = adux1020_measure(data, ADUX1020_MODE_PROX_I, buf);
- if (ret < 0)
- return ret;
-
- *val = buf[0];
- return IIO_VAL_INT;
- default:
+ if (chan->type != IIO_PROXIMITY)
return -EINVAL;
- }
- case IIO_CHAN_INFO_PROCESSED:
- switch (chan->type) {
- case IIO_CURRENT:
- ret = regmap_read(data->regmap,
- ADUX1020_REG_LED_CURRENT, &regval);
- if (ret < 0)
- return ret;

- regval = regval & ADUX1020_LED_CURRENT_MASK;
+ ret = adux1020_set_mode(data, ADUX1020_MODE_PROX_I);
+ if (ret < 0)
+ return ret;

- *val = adux1020_led_currents[regval][0];
- *val2 = adux1020_led_currents[regval][1];
+ ret = adux1020_measure(data, ADUX1020_MODE_PROX_I, buf);
+ if (ret < 0)
+ return ret;

- return IIO_VAL_INT_PLUS_MICRO;
- default:
+ *val = buf[0];
+
+ return IIO_VAL_INT;
+ case IIO_CHAN_INFO_PROCESSED:
+ if (chan->type != IIO_CURRENT)
return -EINVAL;
- }
+
+ ret = regmap_read(map, ADUX1020_REG_LED_CURRENT, &regval);
+ if (ret)
+ return ret;
+
+ regval = regval & ADUX1020_LED_CURRENT_MASK;
+
+ *val = adux1020_led_currents[regval][0];
+ *val2 = adux1020_led_currents[regval][1];
+
+ return IIO_VAL_INT_PLUS_MICRO;
case IIO_CHAN_INFO_SAMP_FREQ:
- switch (chan->type) {
- case IIO_PROXIMITY:
- ret = regmap_read(data->regmap, ADUX1020_REG_FREQUENCY,
- &regval);
- if (ret < 0)
- return ret;
-
- regval = FIELD_GET(ADUX1020_PROX_FREQ_MASK, regval);
- if (regval >= ARRAY_SIZE(adux1020_rates))
- return -EINVAL;
-
- *val = adux1020_rates[regval][0];
- *val2 = adux1020_rates[regval][1];
-
- return IIO_VAL_INT_PLUS_MICRO;
- default:
+ if (chan->type != IIO_PROXIMITY)
+ return -EINVAL;
+
+ ret = regmap_read(map, ADUX1020_REG_FREQUENCY, &regval);
+ if (ret)
+ return ret;
+
+ regval = FIELD_GET(ADUX1020_PROX_FREQ_MASK, regval);
+ if (regval >= ARRAY_SIZE(adux1020_rates))
return -EINVAL;
- }
+
+ *val = adux1020_rates[regval][0];
+ *val2 = adux1020_rates[regval][1];
+
+ return IIO_VAL_INT_PLUS_MICRO;
default:
return -EINVAL;
}
-};
+}

static inline int adux1020_find_index(const int array[][2], int count, int val,
int val2)
@@ -443,43 +437,40 @@ static int adux1020_write_raw(struct iio_dev *indio_dev,
int val, int val2, long mask)
{
struct adux1020_data *data = iio_priv(indio_dev);
+ struct regmap *map = data->regmap;
int i;

guard(mutex)(&data->lock);

switch (mask) {
case IIO_CHAN_INFO_SAMP_FREQ:
- if (chan->type == IIO_PROXIMITY) {
- i = adux1020_find_index(adux1020_rates,
- ARRAY_SIZE(adux1020_rates),
- val, val2);
- if (i < 0)
- return i;
-
- return regmap_update_bits(data->regmap,
- ADUX1020_REG_FREQUENCY,
- ADUX1020_PROX_FREQ_MASK,
- ADUX1020_PROX_FREQ(i));
- }
- break;
+ if (chan->type != IIO_PROXIMITY)
+ return -EINVAL;
+
+ i = adux1020_find_index(adux1020_rates,
+ ARRAY_SIZE(adux1020_rates),
+ val, val2);
+ if (i < 0)
+ return i;
+
+ return regmap_update_bits(map, ADUX1020_REG_FREQUENCY,
+ ADUX1020_PROX_FREQ_MASK,
+ ADUX1020_PROX_FREQ(i));
case IIO_CHAN_INFO_PROCESSED:
- if (chan->type == IIO_CURRENT) {
- i = adux1020_find_index(adux1020_led_currents,
+ if (chan->type != IIO_CURRENT)
+ return -EINVAL;
+
+ i = adux1020_find_index(adux1020_led_currents,
ARRAY_SIZE(adux1020_led_currents),
val, val2);
- if (i < 0)
- return i;
+ if (i < 0)
+ return i;

- return regmap_update_bits(data->regmap,
- ADUX1020_REG_LED_CURRENT,
- ADUX1020_LED_CURRENT_MASK, i);
- }
- break;
+ return regmap_update_bits(map, ADUX1020_REG_LED_CURRENT,
+ ADUX1020_LED_CURRENT_MASK, i);
default:
- break;
+ return -EINVAL;
}
-
- return -EINVAL;
}

static int adux1020_write_event_config(struct iio_dev *indio_dev,

--
2.56.0