Re: [PATCH 1/9] iio: adc: ad7606: Fix hardcoded offset in the ADC channels

Jonathan Cameron
2024-11-26T18:15:35Z

On Thu, 21 Nov 2024 10:18:23 +0000
Guillaume Stols <gstols@baylibre.com> wrote:

> When introducing num_adc_channels, I overlooked some new functions
> created in a meanwhile that had also the hardcoded offset. This commit
> adds the new logic to these functions.
>
> Fixes: 7a671afeb592 ("iio: adc: ad7606: Introduce num_adc_channels")
> Signed-off-by: Guillaume Stols <gstols@baylibre.com>
Hi Guillaume,

Trivial thing inline.

I can't pick this up quite yet as need to wait to rebase my fixes on rc1 sometime
next week.

Jonathan

> ---
> drivers/iio/adc/ad7606.c | 48 ++++++++++++++++++++++++++++--------------------
> drivers/iio/adc/ad7606.h | 2 +-
> 2 files changed, 29 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
> index 8b2046baaa3e..893b93b86aa7 100644
> --- a/drivers/iio/adc/ad7606.c
> +++ b/drivers/iio/adc/ad7606.c
> @@ -175,17 +175,17 @@ static const struct iio_chan_spec ad7616_channels[] = {
> -static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st,
> +static int ad7606_16bit_chan_scale_setup(struct iio_dev *indio_dev,
> struct iio_chan_spec *chan, int ch)
> {
> + struct ad7606_state *st = iio_priv(indio_dev);
> struct ad7606_chan_scale *cs = &st->chan_scales[ch];
>
> if (!st->sw_mode_en) {
> @@ -345,10 +346,12 @@ static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st,
> return 0;
> }
>
> -static int ad7606_get_chan_config(struct ad7606_state *st, int ch,
> +static int ad7606_get_chan_config(struct iio_dev *indio_dev, int ch,
> bool *bipolar, bool *differential)
> {
> - unsigned int num_channels = st->chip_info->num_channels - 1;
> + struct ad7606_state *st = iio_priv(indio_dev);
> + unsigned int num_channels = st->chip_info->num_adc_channels;
> + unsigned int offset = indio_dev->num_channels - st->chip_info->num_adc_channels;
> struct device *dev = st->dev;
> int ret;
>
> @@ -364,7 +367,7 @@ static int ad7606_get_chan_config(struct ad7606_state *st, int ch,
> continue;
>
> /* channel number (here) is from 1 to num_channels */
> - if (reg == 0 || reg > num_channels) {
> + if (reg < offset || reg > num_channels) {

Unwanted bonus space before ||

> dev_warn(dev,
> "Invalid channel number (ignoring): %d\n", reg);
> continue;
> @@ -399,9 +402,10 @@ static int ad7606_get_chan_config(struct ad7606_state *st, int ch,
> return 0;
> }