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

Groups > linux.kernel > #1560386

[PATCH v2 07/15] staging: iio: isl29028: move failure logging into isl29028_set_als_scale()

Show all headers | View raw

When isl29028_set_als_scale() fails, it was up to both callers to log
the failure message. This patch moves the logging into
isl29028_set_als_scale() to reduce the overall amount of code in the
driver.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/isl29028.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index bd85ccb..8e7b3db 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -123,11 +123,22 @@ static int isl29028_enable_proximity(struct isl29028_chip *chip, bool enable)
 
 static int isl29028_set_als_scale(struct isl29028_chip *chip, int lux_scale)
 {
+	struct device *dev = regmap_get_device(chip->regmap);
 	int val = (lux_scale == 2000) ? ISL29028_CONF_ALS_RANGE_HIGH_LUX :
 					ISL29028_CONF_ALS_RANGE_LOW_LUX;
+	int ret;
+
+	ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
+				 ISL29028_CONF_ALS_RANGE_MASK, val);
+	if (ret < 0) {
+		dev_err(dev, "%s(): Error %d setting the ALS scale\n", __func__,
+			ret);
+		return ret;
+	}
 
-	return regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-				  ISL29028_CONF_ALS_RANGE_MASK, val);
+	chip->lux_scale = lux_scale;
+
+	return ret;
 }
 
 static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,
@@ -318,13 +329,6 @@ static int isl29028_write_raw(struct iio_dev *indio_dev,
 		}
 
 		ret = isl29028_set_als_scale(chip, val);
-		if (ret < 0) {
-			dev_err(dev,
-				"Setting lux scale fail with error %d\n", ret);
-			break;
-		}
-
-		chip->lux_scale = val;
 		break;
 	default:
 		dev_err(dev, "Unsupported channel type\n");
@@ -443,10 +447,7 @@ static int isl29028_chip_init_and_power_on(struct isl29028_chip *chip)
 	if (ret < 0)
 		return ret;
 
-	ret = isl29028_set_als_scale(chip, chip->lux_scale);
-	if (ret < 0)
-		dev_err(dev, "setting als scale failed, err = %d\n", ret);
-	return ret;
+	return isl29028_set_als_scale(chip, chip->lux_scale);
 }
 
 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