diff options
| author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2017-09-24 23:59:17 +0200 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2017-10-09 20:50:08 +0100 |
| commit | 1e2ed3d0d27d80aa312b7b0081c0da56e04baeb9 (patch) | |
| tree | a576b826c53f096cc405997e5ed956e7a1bc94a2 /drivers/iio/light | |
| parent | 1540d0106bcbc4e52013d759a0a0752ae7b4a09d (diff) | |
| download | op-kernel-dev-1e2ed3d0d27d80aa312b7b0081c0da56e04baeb9.zip op-kernel-dev-1e2ed3d0d27d80aa312b7b0081c0da56e04baeb9.tar.gz | |
iio: light: vl6180: Move range check to integration time setter, cleanup
This improves code uniformity (range checks for als_gain are also done
in the setter). Also unmangle rounding and calculation of register value.
The calculated integration time it_ms is required in the next patch of
the series.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/light')
| -rw-r--r-- | drivers/iio/light/vl6180.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c index 2306967..3294839 100644 --- a/drivers/iio/light/vl6180.c +++ b/drivers/iio/light/vl6180.c @@ -386,16 +386,21 @@ fail: return -EINVAL; } -static int vl6180_set_it(struct vl6180_data *data, int val2) +static int vl6180_set_it(struct vl6180_data *data, int val, int val2) { - int ret; + int ret, it_ms; + + it_ms = (val2 + 500) / 1000; /* round to ms */ + if (val != 0 || it_ms < 1 || it_ms > 512) + return -EINVAL; mutex_lock(&data->lock); ret = vl6180_hold(data, true); if (ret < 0) goto fail; - ret = vl6180_write_word(data->client, VL6180_ALS_IT, - (val2 - 500) / 1000); /* write value in ms */ + + ret = vl6180_write_word(data->client, VL6180_ALS_IT, it_ms - 1); + fail: vl6180_hold(data, false); mutex_unlock(&data->lock); @@ -411,10 +416,8 @@ static int vl6180_write_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_INT_TIME: - if (val != 0 || val2 < 500 || val2 >= 512500) - return -EINVAL; + return vl6180_set_it(data, val, val2); - return vl6180_set_it(data, val2); case IIO_CHAN_INFO_HARDWAREGAIN: if (chan->type != IIO_LIGHT) return -EINVAL; |
