[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250825-mcp9600-iir-v7-5-2ba676a52589@kernel.org>
Date: Mon, 25 Aug 2025 20:10:07 -0400
From: Ben Collins <bcollins@...nel.org>
To: Jonathan Cameron <jic23@...nel.org>,
David Lechner <dlechner@...libre.com>,
Nuno Sá <nuno.sa@...log.com>,
Andy Shevchenko <andy@...nel.org>,
Antoniu Miclaus <antoniu.miclaus@...log.com>,
Lars-Peter Clausen <lars@...afoo.de>,
Michael Hennerich <Michael.Hennerich@...log.com>
Cc: linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org,
Ben Collins <bcollins@...nel.org>
Subject: [PATCH v7 5/5] iio: ad4080: Rework filter_type "none" logic
The filter_type logic for "none" needed to be reworked to be more
general.
As documented, return IIO_VAL_EMPTY for sampling rates in "none" type
and EINVAL when there's an attempt to write a rate for "none" type.
Signed-off-by: Ben Collins <bcollins@...nel.org>
---
drivers/iio/adc/ad4080.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/iio/adc/ad4080.c b/drivers/iio/adc/ad4080.c
index 6e61787ed3213fe4332bd92b938a7a717dada99f..c7408b9703731ee5d4229a85ffa91ea64b233cd9 100644
--- a/drivers/iio/adc/ad4080.c
+++ b/drivers/iio/adc/ad4080.c
@@ -154,8 +154,6 @@ static const int ad4080_dec_rate_avail[] = {
2, 4, 8, 16, 32, 64, 128, 256, 512, 1024,
};
-static const int ad4080_dec_rate_none[] = { 1 };
-
static const char * const ad4080_power_supplies[] = {
"vdd33", "vdd11", "vddldo", "iovdd", "vrefin",
};
@@ -268,13 +266,13 @@ static int ad4080_read_raw(struct iio_dev *indio_dev,
*val = st->clk_rate;
return IIO_VAL_INT;
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
- if (st->filter_type == FILTER_NONE) {
- *val = 1;
- } else {
- *val = ad4080_get_dec_rate(indio_dev, chan);
- if (*val < 0)
- return *val;
- }
+ if (st->filter_type == FILTER_NONE)
+ return IIO_VAL_EMPTY;
+
+ *val = ad4080_get_dec_rate(indio_dev, chan);
+ if (*val < 0)
+ return *val;
+
return IIO_VAL_INT;
default:
return -EINVAL;
@@ -289,7 +287,7 @@ static int ad4080_write_raw(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
- if (st->filter_type == FILTER_NONE && val > 1)
+ if (st->filter_type == FILTER_NONE)
return -EINVAL;
return ad4080_set_dec_rate(indio_dev, chan, val);
@@ -376,17 +374,16 @@ static int ad4080_read_avail(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
switch (st->filter_type) {
case FILTER_NONE:
- *vals = ad4080_dec_rate_none;
- *length = ARRAY_SIZE(ad4080_dec_rate_none);
+ *type = IIO_VAL_EMPTY;
break;
default:
*vals = ad4080_dec_rate_avail;
*length = st->filter_type >= SINC_5 ?
(ARRAY_SIZE(ad4080_dec_rate_avail) - 2) :
ARRAY_SIZE(ad4080_dec_rate_avail);
+ *type = IIO_VAL_INT;
break;
}
- *type = IIO_VAL_INT;
return IIO_AVAIL_LIST;
default:
return -EINVAL;
--
2.39.5
Powered by blists - more mailing lists