iio: temperature: ltc2983: Fix macro parenthesization and rename

Wrap the 'chan' parameter in LTC2983_CHAN_START_ADDR() and
LTC2983_CHAN_RES_ADDR() with parentheses to prevent potential
macro argument expansion issues. Also rename LTC2983_CHAN_START_ADDR
to LTC2983_CHAN_ASSIGN_ADDR and LTC2983_CHAN_RES_ADDR to
LTC2983_RESULT_ADDR, to better reflect the datasheet names and avoid
them being confused as related.

Reviewed-by: Joshua Crofts <joshua.crofts1@gmail.com>
Signed-off-by: Liviu Stan <liviu.stan@analog.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/temperature/ltc2983.c b/drivers/iio/temperature/ltc2983.c
index 2bc5cd46a72f3ba603d7c2c0efc2ecdf5380ea24..4bae90f03002de571e4b55709a9d541bfd3609b2 100644 (file)
--- a/drivers/iio/temperature/ltc2983.c
+++ b/drivers/iio/temperature/ltc2983.c
@@ -56,10 +56,10 @@
 #define LTC2983_EEPROM_WRITE_TIME_MS           2600
 #define LTC2983_EEPROM_READ_TIME_MS            20
 
-#define LTC2983_CHAN_START_ADDR(chan) \
-                       (((chan - 1) * 4) + LTC2983_CHAN_ASSIGN_START_REG)
-#define LTC2983_CHAN_RES_ADDR(chan) \
-                       (((chan - 1) * 4) + LTC2983_TEMP_RES_START_REG)
+#define LTC2983_CHAN_ASSIGN_ADDR(chan) \
+                       ((((chan) - 1) * 4) + LTC2983_CHAN_ASSIGN_START_REG)
+#define LTC2983_RESULT_ADDR(chan) \
+                       ((((chan) - 1) * 4) + LTC2983_TEMP_RES_START_REG)
 #define LTC2983_THERMOCOUPLE_DIFF_MASK         BIT(3)
 #define LTC2983_THERMOCOUPLE_SGL(x) \
                                FIELD_PREP(LTC2983_THERMOCOUPLE_DIFF_MASK, x)
@@ -351,7 +351,7 @@ static int __ltc2983_chan_assign_common(struct ltc2983_data *st,
                                        const struct ltc2983_sensor *sensor,
                                        u32 chan_val)
 {
-       u32 reg = LTC2983_CHAN_START_ADDR(sensor->chan);
+       u32 reg = LTC2983_CHAN_ASSIGN_ADDR(sensor->chan);
 
        chan_val |= LTC2983_CHAN_TYPE(sensor->type);
        dev_dbg(&st->spi->dev, "Assign reg:0x%04X, val:0x%08X\n", reg,
@@ -1196,7 +1196,7 @@ static int ltc2983_chan_read(struct ltc2983_data *st,
        }
 
        /* read the converted data */
-       ret = regmap_bulk_read(st->regmap, LTC2983_CHAN_RES_ADDR(sensor->chan),
+       ret = regmap_bulk_read(st->regmap, LTC2983_RESULT_ADDR(sensor->chan),
                               &st->temp, sizeof(st->temp));
        if (ret)
                return ret;