Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1560402

[PATCH v2 14/15] staging: iio: isl29028: only set ALS scale when ALS/IR sensing is enabled

Show all headers | View raw

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>
---
 drivers/staging/iio/light/isl29028.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index fa58d08..598a5a5 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -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,
 				    enum isl29028_als_ir_mode mode)
 {
-	int ret = 0;
+	int ret;
 
 	if (chip->als_ir_mode == mode)
 		return 0;
 
+	ret = isl29028_set_als_scale(chip, chip->lux_scale);
+	if (ret < 0)
+		return ret;
+
 	switch (mode) {
 	case ISL29028_MODE_ALS:
 		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 isl29028_set_als_scale(chip, chip->lux_scale);
+	return ret;
 }
 
 static bool isl29028_is_volatile_reg(struct device *dev, unsigned int reg)
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/15] staging cleanups Brian Masney <masneyb@onstation.org> - 2017-01-17 10:30 +0100
  [PATCH v2 02/15] staging: iio: isl29028: fix alignment of function arguments Brian Masney <masneyb@onstation.org> - 2017-01-17 10:30 +0100
    Re: [PATCH v2 02/15] staging: iio: isl29028: fix alignment of  function arguments Jonathan Cameron <jic23@kernel.org> - 2017-01-21 15:40 +0100
  [PATCH v2 07/15] staging: iio: isl29028: move failure logging into isl29028_set_als_scale() Brian Masney <masneyb@onstation.org> - 2017-01-17 10:30 +0100
    Re: [PATCH v2 07/15] staging: iio: isl29028: move failure logging  into isl29028_set_als_scale() Jonathan Cameron <jic23@kernel.org> - 2017-01-21 15:50 +0100
  [PATCH v2 03/15] staging: iio: isl29028: combine isl29028_proxim_get() and isl29028_read_proxim() Brian Masney <masneyb@onstation.org> - 2017-01-17 10:30 +0100
    Re: [PATCH v2 03/15] staging: iio: isl29028: combine  isl29028_proxim_get() and isl29028_read_proxim() Jonathan Cameron <jic23@kernel.org> - 2017-01-21 15:50 +0100
  [PATCH v2 06/15] staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling() Brian Masney <masneyb@onstation.org> - 2017-01-17 10:30 +0100
    Re: [PATCH v2 06/15] staging: iio: isl29028: move failure logging  into isl29028_set_proxim_sampling() Jonathan Cameron <jic23@kernel.org> - 2017-01-21 15:40 +0100
  [PATCH v2 14/15] staging: iio: isl29028: only set ALS scale when ALS/IR sensing is enabled Brian Masney <masneyb@onstation.org> - 2017-01-17 10:50 +0100
    Re: [PATCH v2 14/15] staging: iio: isl29028: only set ALS scale when  ALS/IR sensing is enabled Jonathan Cameron <jic23@kernel.org> - 2017-01-21 16:00 +0100
  [PATCH v2 15/15] staging: iio: isl29028: add runtime power management support Brian Masney <masneyb@onstation.org> - 2017-01-17 10:50 +0100
    Re: [PATCH v2 15/15] staging: iio: isl29028: add runtime power  management support Jonathan Cameron <jic23@kernel.org> - 2017-01-21 16:00 +0100
      Re: [PATCH v2 15/15] staging: iio: isl29028: add runtime power  management support Brian Masney <masneyb@onstation.org> - 2017-01-21 17:50 +0100
        Re: [PATCH v2 15/15] staging: iio: isl29028: add runtime power management support Jonathan Cameron <jic23@kernel.org> - 2017-01-21 18:40 +0100
  [PATCH v2 12/15] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity() Brian Masney <masneyb@onstation.org> - 2017-01-17 10:50 +0100
    Re: [PATCH v2 12/15] staging: iio: isl29028: remove enable flag from  isl29028_enable_proximity() Jonathan Cameron <jic23@kernel.org> - 2017-01-21 15:50 +0100
  [PATCH v2 13/15] staging: iio: isl29028: only set proximity sampling rate when proximity is enabled Brian Masney <masneyb@onstation.org> - 2017-01-17 10:50 +0100
    Re: [PATCH v2 13/15] staging: iio: isl29028: only set proximity  sampling rate when proximity is enabled Jonathan Cameron <jic23@kernel.org> - 2017-01-21 15:50 +0100

csiph-web