iio: adc: ad7606: don't use address field

Drop use of the address field in the ad7606 driver. This field was
duplicating the same info that was already in the channel and scan_index
fields. This is one less thing to have to hold in your mind when reading
the code.

Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250318-iio-adc-ad7606-improvements-v2-7-4b605427774c@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index 84f45d8a4b0ef2e60de1f030d310d20195626dc8..826685b2fb23f59a958635d2f04ea7c85897fc6f 100644 (file)
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@ -776,14 +776,14 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
        case IIO_CHAN_INFO_RAW:
                if (!iio_device_claim_direct(indio_dev))
                        return -EBUSY;
-               ret = ad7606_scan_direct(indio_dev, chan->address, val);
+               ret = ad7606_scan_direct(indio_dev, chan->scan_index, val);
                iio_device_release_direct(indio_dev);
                if (ret < 0)
                        return ret;
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                if (st->sw_mode_en)
-                       ch = chan->address;
+                       ch = chan->scan_index;
                cs = &st->chan_scales[ch];
                *val = cs->scale_avail[cs->range][0];
                *val2 = cs->scale_avail[cs->range][1];
@@ -865,7 +865,7 @@ static int ad7606_write_raw(struct iio_dev *indio_dev,
        switch (mask) {
        case IIO_CHAN_INFO_SCALE:
                if (st->sw_mode_en)
-                       ch = chan->address;
+                       ch = chan->scan_index;
                cs = &st->chan_scales[ch];
                for (i = 0; i < cs->num_scales; i++) {
                        scale_avail_uv[i] = cs->scale_avail[i][0] * MICRO +
@@ -1072,7 +1072,7 @@ static int ad7606_read_avail(struct iio_dev *indio_dev,
 
        case IIO_CHAN_INFO_SCALE:
                if (st->sw_mode_en)
-                       ch = chan->address;
+                       ch = chan->scan_index;
 
                cs = &st->chan_scales[ch];
                *vals = (int *)cs->scale_avail;

diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h
index 5ee04e8f4041c75d66b899a9371a75b5d0f31071..16a230a7c00e3504744b97da339cdea6b8ecf40f 100644 (file)
--- a/drivers/iio/adc/ad7606.h
+++ b/drivers/iio/adc/ad7606.h
@@ -45,7 +45,6 @@
                .type = IIO_VOLTAGE,                            \
                .indexed = 1,                                   \
                .channel = num,                                 \
-               .address = num,                                 \
                .info_mask_separate = mask_sep,                 \
                .info_mask_separate_available =                 \
                        mask_sep_avail,                         \