iio: mlx90614: Refactor register symbols

The defined registers only make sense when used for accessing RAM. Make
MLX90614_OP_RAM part of the symbol definition to avoid accidental access
to the wrong register.

Signed-off-by: Vianney le Clément de Saint-Marcq <vianney.leclement@essensium.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/temperature/mlx90614.c b/drivers/iio/temperature/mlx90614.c
index c8b6ac8..e2c6f1a 100644 (file)
--- a/drivers/iio/temperature/mlx90614.c
+++ b/drivers/iio/temperature/mlx90614.c
@@ -23,8 +23,8 @@
 #define MLX90614_OP_RAM 0x00
 
 /* RAM offsets with 16-bit data, MSB first */
-#define MLX90614_TA 0x06 /* ambient temperature */
-#define MLX90614_TOBJ1 0x07 /* object temperature */
+#define MLX90614_TA    (MLX90614_OP_RAM | 0x06) /* ambient temperature */
+#define MLX90614_TOBJ1 (MLX90614_OP_RAM | 0x07) /* object 1 temperature */
 
 struct mlx90614_data {
        struct i2c_client *client;
@@ -42,13 +42,13 @@ static int mlx90614_read_raw(struct iio_dev *indio_dev,
                switch (channel->channel2) {
                case IIO_MOD_TEMP_AMBIENT:
                        ret = i2c_smbus_read_word_data(data->client,
-                           MLX90614_OP_RAM | MLX90614_TA);
+                           MLX90614_TA);
                        if (ret < 0)
                                return ret;
                        break;
                case IIO_MOD_TEMP_OBJECT:
                        ret = i2c_smbus_read_word_data(data->client,
-                           MLX90614_OP_RAM | MLX90614_TOBJ1);
+                           MLX90614_TOBJ1);
                        if (ret < 0)
                                return ret;
                        break;