iio: chemical: bme680: change MSK->MASK in #defines

Convert all defines to use "MASK" instead of a mix of "MSK" and "MASK"

Signed-off-by: David Frey <dpfrey@gmail.com>
Reviewed-by: Himanshu Jha <himanshujha199640@gmail.com>
Tested-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/chemical/bme680.h b/drivers/iio/chemical/bme680.h
index dd4247d364a04569b4c3ea712871cd80c822b6ba..437d75c2bad5f2f91c1722073005df28d32bc82a 100644 (file)
--- a/drivers/iio/chemical/bme680.h
+++ b/drivers/iio/chemical/bme680.h
@@ -39,13 +39,13 @@
 
 #define BME680_MAX_OVERFLOW_VAL                        0x40000000
 #define BME680_HUM_REG_SHIFT_VAL               4
-#define BME680_BIT_H1_DATA_MSK                 0x0F
+#define BME680_BIT_H1_DATA_MASK                        0x0F
 
 #define BME680_REG_RES_HEAT_RANGE              0x02
-#define   BME680_RHRANGE_MSK                   0x30
+#define   BME680_RHRANGE_MASK                  0x30
 #define BME680_REG_RES_HEAT_VAL                        0x00
 #define BME680_REG_RANGE_SW_ERR                        0x04
-#define   BME680_RSERROR_MSK                   0xF0
+#define   BME680_RSERROR_MASK                  0xF0
 #define BME680_REG_RES_HEAT_0                  0x5A
 #define BME680_REG_GAS_WAIT_0                  0x64
 #define BME680_ADC_GAS_RES_SHIFT               6

diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c
index 103085360415daf53812b48c84df8c8ce9e50718..0ebe2d26ff1b9cfba2c38c5fa68574e59ba9f64e 100644 (file)
--- a/drivers/iio/chemical/bme680_core.c
+++ b/drivers/iio/chemical/bme680_core.c
@@ -206,7 +206,7 @@ static int bme680_read_calib(struct bme680_data *data,
                return ret;
        }
        calib->par_h1 = (tmp_msb << BME680_HUM_REG_SHIFT_VAL) |
-                       (tmp_lsb & BME680_BIT_H1_DATA_MSK);
+                       (tmp_lsb & BME680_BIT_H1_DATA_MASK);
 
        ret = regmap_read(data->regmap, BME680_H2_MSB_REG, &tmp_msb);
        if (ret < 0) {
@@ -285,7 +285,7 @@ static int bme680_read_calib(struct bme680_data *data,
                dev_err(dev, "failed to read resistance heat range\n");
                return ret;
        }
-       calib->res_heat_range = (tmp & BME680_RHRANGE_MSK) / 16;
+       calib->res_heat_range = (tmp & BME680_RHRANGE_MASK) / 16;
 
        ret = regmap_read(data->regmap, BME680_REG_RES_HEAT_VAL, &tmp);
        if (ret < 0) {
@@ -299,7 +299,7 @@ static int bme680_read_calib(struct bme680_data *data,
                dev_err(dev, "failed to read range software error\n");
                return ret;
        }
-       calib->range_sw_err = (tmp & BME680_RSERROR_MSK) / 16;
+       calib->range_sw_err = (tmp & BME680_RSERROR_MASK) / 16;
 
        return 0;
 }