staging: iio: adc: ad7280a: split ad7280_channel_init() to more functions

The ad7280_channel_init function has been split into more specific
functions to increase the code readability.

The setting of channel's scan_type.shift to 0, has been removed, since
it is the default value.

Signed-off-by: Slawomir Stepien <sst@poczta.fm>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index 14f6a3c..8439a4e 100644 (file)
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -97,6 +97,10 @@
 #define AD7280A_NUM_CH                 (AD7280A_AUX_ADC_6 - \
                                        AD7280A_CELL_VOLTAGE_1 + 1)
 
+#define AD7280A_CALC_VOLTAGE_CHAN_NUM(d, c) ((d * AD7280A_CELLS_PER_DEV) + c)
+#define AD7280A_CALC_TEMP_CHAN_NUM(d, c)    ((d * AD7280A_CELLS_PER_DEV) + \
+                                            c - AD7280A_CELLS_PER_DEV)
+
 #define AD7280A_DEVADDR_MASTER         0
 #define AD7280A_DEVADDR_ALL            0x1F
 /* 5-bit device address is sent LSB first */
@@ -496,63 +500,98 @@ static const struct attribute_group ad7280_attrs_group = {
        .attrs = ad7280_attributes,
 };
 
+static void ad7280_voltage_channel_init(struct iio_chan_spec *chan, int i)
+{
+       chan->type = IIO_VOLTAGE;
+       chan->differential = 1;
+       chan->channel = i;
+       chan->channel2 = chan->channel + 1;
+}
+
+static void ad7280_temp_channel_init(struct iio_chan_spec *chan, int i)
+{
+       chan->type = IIO_TEMP;
+       chan->channel = i;
+}
+
+static void ad7280_common_fields_init(struct iio_chan_spec *chan, int addr,
+                                     int cnt)
+{
+       chan->indexed = 1;
+       chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+       chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE);
+       chan->address = addr;
+       chan->scan_index = cnt;
+       chan->scan_type.sign = 'u';
+       chan->scan_type.realbits = 12;
+       chan->scan_type.storagebits = 32;
+}
+
+static void ad7280_total_voltage_channel_init(struct iio_chan_spec *chan,
+                                             int cnt, int dev)
+{
+       chan->type = IIO_VOLTAGE;
+       chan->differential = 1;
+       chan->channel = 0;
+       chan->channel2 = dev * AD7280A_CELLS_PER_DEV;
+       chan->address = AD7280A_ALL_CELLS;
+       chan->indexed = 1;
+       chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+       chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE);
+       chan->scan_index = cnt;
+       chan->scan_type.sign = 'u';
+       chan->scan_type.realbits = 32;
+       chan->scan_type.storagebits = 32;
+}
+
+static void ad7280_timestamp_channel_init(struct iio_chan_spec *chan, int cnt)
+{
+       chan->type = IIO_TIMESTAMP;
+       chan->channel = -1;
+       chan->scan_index = cnt;
+       chan->scan_type.sign = 's';
+       chan->scan_type.realbits = 64;
+       chan->scan_type.storagebits = 64;
+}
+
+static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt)
+{
+       int addr, ch, i;
+       struct iio_chan_spec *chan;
+
+       for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_AUX_ADC_6; ch++) {
+               chan = &st->channels[*cnt];
+
+               if (ch < AD7280A_AUX_ADC_1) {
+                       i = AD7280A_CALC_VOLTAGE_CHAN_NUM(dev, ch);
+                       ad7280_voltage_channel_init(chan, i);
+               } else {
+                       i = AD7280A_CALC_TEMP_CHAN_NUM(dev, ch);
+                       ad7280_temp_channel_init(chan, i);
+               }
+
+               addr = ad7280a_devaddr(dev) << 8 | ch;
+               ad7280_common_fields_init(chan, addr, *cnt);
+
+               (*cnt)++;
+       }
+}
+
 static int ad7280_channel_init(struct ad7280_state *st)
 {
-       int dev, ch, cnt;
+       int dev, cnt = 0;
 
        st->channels = devm_kcalloc(&st->spi->dev, (st->slave_num + 1) * 12 + 2,
                                    sizeof(*st->channels), GFP_KERNEL);
        if (!st->channels)
                return -ENOMEM;
 
-       for (dev = 0, cnt = 0; dev <= st->slave_num; dev++)
-               for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_AUX_ADC_6;
-                       ch++, cnt++) {
-                       if (ch < AD7280A_AUX_ADC_1) {
-                               st->channels[cnt].type = IIO_VOLTAGE;
-                               st->channels[cnt].differential = 1;
-                               st->channels[cnt].channel = (dev * 6) + ch;
-                               st->channels[cnt].channel2 =
-                                       st->channels[cnt].channel + 1;
-                       } else {
-                               st->channels[cnt].type = IIO_TEMP;
-                               st->channels[cnt].channel = (dev * 6) + ch - 6;
-                       }
-                       st->channels[cnt].indexed = 1;
-                       st->channels[cnt].info_mask_separate =
-                               BIT(IIO_CHAN_INFO_RAW);
-                       st->channels[cnt].info_mask_shared_by_type =
-                               BIT(IIO_CHAN_INFO_SCALE);
-                       st->channels[cnt].address =
-                               ad7280a_devaddr(dev) << 8 | ch;
-                       st->channels[cnt].scan_index = cnt;
-                       st->channels[cnt].scan_type.sign = 'u';
-                       st->channels[cnt].scan_type.realbits = 12;
-                       st->channels[cnt].scan_type.storagebits = 32;
-                       st->channels[cnt].scan_type.shift = 0;
-               }
+       for (dev = 0; dev <= st->slave_num; dev++)
+               ad7280_init_dev_channels(st, dev, &cnt);
 
-       st->channels[cnt].type = IIO_VOLTAGE;
-       st->channels[cnt].differential = 1;
-       st->channels[cnt].channel = 0;
-       st->channels[cnt].channel2 = dev * 6;
-       st->channels[cnt].address = AD7280A_ALL_CELLS;
-       st->channels[cnt].indexed = 1;
-       st->channels[cnt].info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
-       st->channels[cnt].info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE);
-       st->channels[cnt].scan_index = cnt;
-       st->channels[cnt].scan_type.sign = 'u';
-       st->channels[cnt].scan_type.realbits = 32;
-       st->channels[cnt].scan_type.storagebits = 32;
-       st->channels[cnt].scan_type.shift = 0;
+       ad7280_total_voltage_channel_init(&st->channels[cnt], cnt, dev);
        cnt++;
-       st->channels[cnt].type = IIO_TIMESTAMP;
-       st->channels[cnt].channel = -1;
-       st->channels[cnt].scan_index = cnt;
-       st->channels[cnt].scan_type.sign = 's';
-       st->channels[cnt].scan_type.realbits = 64;
-       st->channels[cnt].scan_type.storagebits = 64;
-       st->channels[cnt].scan_type.shift = 0;
+       ad7280_timestamp_channel_init(&st->channels[cnt], cnt);
 
        return cnt + 1;
 }