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

staging: iio: isl29028: only set ALS scale when ALS/IR sensing is enabled 

isl29028_chip_init_and_power_on() calls isl29028_set_als_scale() and
this is not needed until the user actually needs to take a reading from
the ALS/IR sensor. This patch moves the isl29028_set_als_scale() call
from isl29028_chip_init_and_power_on() to isl29028_set_als_ir_mode().
This sets the stage for faster resume times from runtime power
management if the user is only querying the proximity sensor.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Brian Masney 2017-01-17 04:25:01 -05:00 committed by Jonathan Cameron
parent 84a76694bc
commit 0fac96ed50
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/iio/light/isl29028.c
View File

@ -146,11 +146,15 @@ static int isl29028_set_als_scale(struct isl29028_chip *chip, int lux_scale)
static int isl29028_set_als_ir_mode(struct isl29028_chip *chip, static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,
enum isl29028_als_ir_mode mode) enum isl29028_als_ir_mode mode)
{ {
int ret = 0; int ret;
if (chip->als_ir_mode == mode) if (chip->als_ir_mode == mode)
return 0; return 0;
ret = isl29028_set_als_scale(chip, chip->lux_scale);
if (ret < 0)
return ret;
switch (mode) { switch (mode) {
case ISL29028_MODE_ALS: case ISL29028_MODE_ALS:
ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE, ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
@ -453,7 +457,7 @@ static int isl29028_chip_init_and_power_on(struct isl29028_chip *chip)
return ret; return ret;
} }
return isl29028_set_als_scale(chip, chip->lux_scale); return ret;
} }
static bool isl29028_is_volatile_reg(struct device *dev, unsigned int reg) static bool isl29028_is_volatile_reg(struct device *dev, unsigned int reg)