openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: iio: tsl2x7x: remove ch0 and ch1 variables from tsl2x7x_get_lux() 

Remove the ch0 and ch1 variables from tsl2x7x_get_lux() and
write those values directly into the chip->als_cur_info.als_ch0
and chip->als_cur_info.als_ch01 variables.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Brian Masney 2018-03-21 06:29:10 -04:00 committed by Jonathan Cameron
parent 96e6a016d7
commit 2130e243c4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/iio/light/tsl2x7x.c
View File

@ -336,7 +336,6 @@ static int tsl2x7x_write_control_reg(struct tsl2X7X_chip *chip, u8 data)
*/
static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
{
u16 ch0, ch1; /* separated ch0/ch1 data from device */
u32 lux; /* raw lux calculated from device data */
u64 lux64;
u32 ratio;
@ -382,24 +381,24 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
}
/* extract ALS/lux data */
ch0 = le16_to_cpup((const __le16 *)&buf[0]);
ch1 = le16_to_cpup((const __le16 *)&buf[2]);
chip->als_cur_info.als_ch0 = le16_to_cpup((const __le16 *)&buf[0]);
chip->als_cur_info.als_ch1 = le16_to_cpup((const __le16 *)&buf[2]);
chip->als_cur_info.als_ch0 = ch0;
chip->als_cur_info.als_ch1 = ch1;
if (ch0 >= chip->als_saturation || ch1 >= chip->als_saturation) {
if (chip->als_cur_info.als_ch0 >= chip->als_saturation ||
chip->als_cur_info.als_ch1 >= chip->als_saturation) {
lux = TSL2X7X_LUX_CALC_OVER_FLOW;
goto return_max;
}
if (!ch0) {
if (!chip->als_cur_info.als_ch0) {
/* have no data, so return LAST VALUE */
ret = chip->als_cur_info.lux;
goto out_unlock;
}
/* calculate ratio */
ratio = (ch1 << 15) / ch0;
ratio = (chip->als_cur_info.als_ch1 << 15) / chip->als_cur_info.als_ch0;
/* convert to unscaled lux using the pointer to the table */
p = (struct tsl2x7x_lux *)chip->tsl2x7x_device_lux;
while (p->ratio != 0 && p->ratio < ratio)
@ -408,9 +407,9 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
if (p->ratio == 0) {
lux = 0;
} else {
lux = DIV_ROUND_UP(ch0 * p->ch0,
lux = DIV_ROUND_UP(chip->als_cur_info.als_ch0 * p->ch0,
tsl2x7x_als_gain[chip->settings.als_gain]) -
DIV_ROUND_UP(ch1 * p->ch1,
DIV_ROUND_UP(chip->als_cur_info.als_ch1 * p->ch1,
tsl2x7x_als_gain[chip->settings.als_gain]);
}