diff options
| author | Brian Masney | 2017-01-17 10:25:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron | 2017-01-22 14:21:38 +0100 |
| commit | 84a76694bc17dd31eed84ab2fae857f18909da42 (patch) | |
| tree | 9ca55bb83cbada2e9579cd206eead15237c35d47 /drivers/staging/iio | |
| parent | staging: iio: isl29028: remove enable flag from isl29028_enable_proximity() (diff) | |
| download | kernel-qcow2-linux-84a76694bc17dd31eed84ab2fae857f18909da42.tar.gz kernel-qcow2-linux-84a76694bc17dd31eed84ab2fae857f18909da42.tar.xz kernel-qcow2-linux-84a76694bc17dd31eed84ab2fae857f18909da42.zip | |
staging: iio: isl29028: only set proximity sampling rate when proximity is enabled
isl29028_chip_init_and_power_on() calls isl29028_set_proxim_sampling()
and this is not needed until the user actually needs to take a proximity
reading. This patch moves the isl29028_set_proxim_sampling() call from
isl29028_chip_init_and_power_on() to isl29028_enable_proximity().
This sets the stage for faster resume times from the runtime power
management if the user is only querying the ALS/IR sensor.
Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/light/isl29028.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c index f1b3651c779b..fa58d083906e 100644 --- a/drivers/staging/iio/light/isl29028.c +++ b/drivers/staging/iio/light/isl29028.c @@ -107,6 +107,10 @@ static int isl29028_enable_proximity(struct isl29028_chip *chip) { int ret; + ret = isl29028_set_proxim_sampling(chip, chip->prox_sampling); + if (ret < 0) + return ret; + ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE, ISL29028_CONF_PROX_EN_MASK, ISL29028_CONF_PROX_EN); @@ -449,10 +453,6 @@ static int isl29028_chip_init_and_power_on(struct isl29028_chip *chip) return ret; } - ret = isl29028_set_proxim_sampling(chip, chip->prox_sampling); - if (ret < 0) - return ret; - return isl29028_set_als_scale(chip, chip->lux_scale); } |