Merge tag 'iio-for-5.2a-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux.git] / drivers / staging / iio / adc / ad7280a.c

diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index 47cfe920b2ae9809dcb8c7a26165662f0a080ccd..19a5f244dcae2022675908088f27446c848127a8 100644 (file)
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -96,9 +96,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_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
@@ -782,43 +783,38 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
        for (i = 0; i < st->scan_cnt; i++) {
                if (((channels[i] >> 23) & 0xF) <= AD7280A_CELL_VOLTAGE_6) {
                        if (((channels[i] >> 11) & 0xFFF) >=
-                               st->cell_threshhigh)
-                               iio_push_event(indio_dev,
-                                              IIO_EVENT_CODE(IIO_VOLTAGE,
-                                                       1,
-                                                       0,
-                                                       IIO_EV_DIR_RISING,
-                                                       IIO_EV_TYPE_THRESH,
-                                                       0, 0, 0),
+                           st->cell_threshhigh) {
+                               u64 tmp = IIO_EVENT_CODE(IIO_VOLTAGE, 1, 0,
+                                                        IIO_EV_DIR_RISING,
+                                                        IIO_EV_TYPE_THRESH,
+                                                        0, 0, 0);
+                               iio_push_event(indio_dev, tmp,
                                               iio_get_time_ns(indio_dev));
-                       else if (((channels[i] >> 11) & 0xFFF) <=
-                               st->cell_threshlow)
-                               iio_push_event(indio_dev,
-                                              IIO_EVENT_CODE(IIO_VOLTAGE,
-                                                       1,
-                                                       0,
-                                                       IIO_EV_DIR_FALLING,
-                                                       IIO_EV_TYPE_THRESH,
-                                                       0, 0, 0),
+                       } else if (((channels[i] >> 11) & 0xFFF) <=
+                                  st->cell_threshlow) {
+                               u64 tmp = IIO_EVENT_CODE(IIO_VOLTAGE, 1, 0,
+                                                        IIO_EV_DIR_FALLING,
+                                                        IIO_EV_TYPE_THRESH,
+                                                        0, 0, 0);
+                               iio_push_event(indio_dev, tmp,
                                               iio_get_time_ns(indio_dev));
+                       }
                } else {
-                       if (((channels[i] >> 11) & 0xFFF) >= st->aux_threshhigh)
-                               iio_push_event(indio_dev,
-                                              IIO_UNMOD_EVENT_CODE(
-                                                       IIO_TEMP,
-                                                       0,
+                       if (((channels[i] >> 11) & 0xFFF) >=
+                           st->aux_threshhigh) {
+                               u64 tmp = IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,
                                                        IIO_EV_TYPE_THRESH,
-                                                       IIO_EV_DIR_RISING),
+                                                       IIO_EV_DIR_RISING);
+                               iio_push_event(indio_dev, tmp,
                                               iio_get_time_ns(indio_dev));
-                       else if (((channels[i] >> 11) & 0xFFF) <=
-                               st->aux_threshlow)
-                               iio_push_event(indio_dev,
-                                              IIO_UNMOD_EVENT_CODE(
-                                                       IIO_TEMP,
-                                                       0,
+                       } else if (((channels[i] >> 11) & 0xFFF) <=
+                               st->aux_threshlow) {
+                               u64 tmp = IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0,
                                                        IIO_EV_TYPE_THRESH,
-                                                       IIO_EV_DIR_FALLING),
+                                                       IIO_EV_DIR_FALLING);
+                               iio_push_event(indio_dev, tmp,
                                               iio_get_time_ns(indio_dev));
+                       }
                }
        }
 
@@ -829,30 +825,30 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
 }
 
 static IIO_DEVICE_ATTR_NAMED(in_thresh_low_value,
-               in_voltage-voltage_thresh_low_value,
-               0644,
-               ad7280_read_channel_config,
-               ad7280_write_channel_config,
-               AD7280A_CELL_UNDERVOLTAGE);
+                            in_voltage-voltage_thresh_low_value,
+                            0644,
+                            ad7280_read_channel_config,
+                            ad7280_write_channel_config,
+                            AD7280A_CELL_UNDERVOLTAGE);
 
 static IIO_DEVICE_ATTR_NAMED(in_thresh_high_value,
-               in_voltage-voltage_thresh_high_value,
-               0644,
-               ad7280_read_channel_config,
-               ad7280_write_channel_config,
-               AD7280A_CELL_OVERVOLTAGE);
+                            in_voltage-voltage_thresh_high_value,
+                            0644,
+                            ad7280_read_channel_config,
+                            ad7280_write_channel_config,
+                            AD7280A_CELL_OVERVOLTAGE);
 
 static IIO_DEVICE_ATTR(in_temp_thresh_low_value,
-               0644,
-               ad7280_read_channel_config,
-               ad7280_write_channel_config,
-               AD7280A_AUX_ADC_UNDERVOLTAGE);
+                      0644,
+                      ad7280_read_channel_config,
+                      ad7280_write_channel_config,
+                      AD7280A_AUX_ADC_UNDERVOLTAGE);
 
 static IIO_DEVICE_ATTR(in_temp_thresh_high_value,
-               0644,
-               ad7280_read_channel_config,
-               ad7280_write_channel_config,
-               AD7280A_AUX_ADC_OVERVOLTAGE);
+                      0644,
+                      ad7280_read_channel_config,
+                      ad7280_write_channel_config,
+                      AD7280A_AUX_ADC_OVERVOLTAGE);
 
 static struct attribute *ad7280_event_attributes[] = {
        &iio_dev_attr_in_thresh_low_value.dev_attr.attr,
@@ -920,8 +916,8 @@ static int ad7280_probe(struct spi_device *spi)
        const struct ad7280_platform_data *pdata = dev_get_platdata(&spi->dev);
        struct ad7280_state *st;
        int ret;
-       const unsigned short tACQ_ns[4] = {465, 1010, 1460, 1890};
-       const unsigned short nAVG[4] = {1, 2, 4, 8};
+       const unsigned short t_acq_ns[4] = {465, 1010, 1460, 1890};
+       const unsigned short n_avg[4] = {1, 2, 4, 8};
        struct iio_dev *indio_dev;
 
        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
@@ -969,10 +965,9 @@ static int ad7280_probe(struct spi_device *spi)
         */
 
        st->readback_delay_us =
-               ((tACQ_ns[pdata->acquisition_time & 0x3] + 695) *
-               (AD7280A_NUM_CH * nAVG[pdata->conversion_averaging & 0x3]))
-               - tACQ_ns[pdata->acquisition_time & 0x3] +
-               st->slave_num * 250;
+               ((t_acq_ns[pdata->acquisition_time & 0x3] + 695) *
+                (AD7280A_NUM_CH * n_avg[pdata->conversion_averaging & 0x3])) -
+               t_acq_ns[pdata->acquisition_time & 0x3] + st->slave_num * 250;
 
        /* Convert to usecs */
        st->readback_delay_us = DIV_ROUND_UP(st->readback_delay_us, 1000);