kevin/linux
1
Fork 0
Code

iio: chemical: bme680: Remove duplicate register read

Browse Source 
The LSB of the gas register was read first to check if the following
check was correct and then the MSB+LSB were read together. Simplify this
by reading together the MSB+LSB immediately.

Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20240609233826.330516-7-vassilisamir@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Vasileios Amoiridis 2024-06-10 01:38:17 +02:00 committed by Jonathan Cameron
parent 4d879ba0a6
commit 5a38766897
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/chemical/bme680.h
View File

@ -46,7 +46,7 @@
#define BME680_RSERROR_MASK GENMASK(7, 4)
#define BME680_REG_RES_HEAT_0 0x5A
#define BME680_REG_GAS_WAIT_0 0x64
#define BME680_ADC_GAS_RES_SHIFT 6
#define BME680_ADC_GAS_RES GENMASK(15, 6)
#define BME680_AMB_TEMP 25
#define BME680_REG_CTRL_GAS_1 0x71

21
drivers/iio/chemical/bme680_core.c
View File

@ -767,7 +767,7 @@ static int bme680_read_gas(struct bme680_data *data,
int ret;
__be16 tmp = 0;
unsigned int check;
u16 adc_gas_res;
u16 adc_gas_res, gas_regs_val;
u8 gas_range;
/* Set heater settings */
@ -792,11 +792,14 @@ static int bme680_read_gas(struct bme680_data *data,
return -EBUSY;
}
ret = regmap_read(data->regmap, BME680_REG_GAS_R_LSB, &check);
ret = regmap_bulk_read(data->regmap, BME680_REG_GAS_MSB,
&tmp, sizeof(tmp));
if (ret < 0) {
dev_err(dev, "failed to read gas_r_lsb register\n");
dev_err(dev, "failed to read gas resistance\n");
return ret;
}
gas_regs_val = be16_to_cpu(tmp);
adc_gas_res = FIELD_GET(BME680_ADC_GAS_RES, gas_regs_val);
/*
* occurs if either the gas heating duration was insuffient
@ -804,20 +807,12 @@ static int bme680_read_gas(struct bme680_data *data,
* heater temperature was too high for the heater sink to
* reach.
*/
if ((check & BME680_GAS_STAB_BIT) == 0) {
if ((gas_regs_val & BME680_GAS_STAB_BIT) == 0) {
dev_err(dev, "heater failed to reach the target temperature\n");
return -EINVAL;
}
ret = regmap_bulk_read(data->regmap, BME680_REG_GAS_MSB,
&tmp, sizeof(tmp));
if (ret < 0) {
dev_err(dev, "failed to read gas resistance\n");
return ret;
}
gas_range = check & BME680_GAS_RANGE_MASK;
adc_gas_res = be16_to_cpu(tmp) >> BME680_ADC_GAS_RES_SHIFT;
gas_range = FIELD_GET(BME680_GAS_RANGE_MASK, gas_regs_val);
*val = bme680_compensate_gas(data, adc_gas_res, gas_range);
return IIO_VAL_INT;