diff options
| author |   Brian Masney <masneyb@onstation.org> | 2017-01-17 04:24:54 -0500 |
|---|---|---|
| committer |   Jonathan Cameron <jic23@kernel.org> | 2017-01-22 13:21:35 +0000 |
| commit | bcf5104e27187b8441aa10714b2dbe49f154bc92 (patch) | |
| tree | 4212bcf86e51ce2ceb07c4e7e6ac56ab9cc40b07 /drivers/staging/iio | |
| parent | staging: iio: isl29028: move failure logging into isl29028_set_proxim_sampling() (diff) | |
| download | linux-dev-bcf5104e27187b8441aa10714b2dbe49f154bc92.tar.xz linux-dev-bcf5104e27187b8441aa10714b2dbe49f154bc92.zip | |
staging: iio: isl29028: move failure logging into isl29028_set_als_scale()
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>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/light/isl29028.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c index bd85ccb1b120..8e7b3dbee183 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) |