Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1734625 > unrolled thread
| Started by | Stefan Brüns <stefan.bruens@rwth-aachen.de> |
|---|---|
| First post | 2017-09-19 05:20 +0200 |
| Last post | 2017-09-24 17:40 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup Stefan Brüns <stefan.bruens@rwth-aachen.de> - 2017-09-19 05:20 +0200
Re: [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup Peter Meerwald-Stadler <pmeerw@pmeerw.net> - 2017-09-19 08:20 +0200
Re: [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup Jonathan Cameron <jic23@kernel.org> - 2017-09-24 17:40 +0200
| From | Stefan Brüns <stefan.bruens@rwth-aachen.de> |
|---|---|
| Date | 2017-09-19 05:20 +0200 |
| Subject | [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup |
| Message-ID | <urheN-77g-1@gated-at.bofh.it> |
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>
---
drivers/iio/light/vl6180.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
index 6e25b724d941..57577d5d18ac 100644
--- a/drivers/iio/light/vl6180.c
+++ b/drivers/iio/light/vl6180.c
@@ -386,16 +386,21 @@ static int vl6180_set_als_gain(struct vl6180_data *data, int val, int val2)
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,15 +416,14 @@ 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;
return vl6180_set_als_gain(data, val, val2);
+
default:
return -EINVAL;
}
--
2.14.1
[toc] | [next] | [standalone]
| From | Peter Meerwald-Stadler <pmeerw@pmeerw.net> |
|---|---|
| Date | 2017-09-19 08:20 +0200 |
| Subject | Re: [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup |
| Message-ID | <urk30-rX-23@gated-at.bofh.it> |
| In reply to | #1734625 |
[Multipart message — attachments visible in raw view] — view raw
> This improves code uniformity (range checks for als_gain are also done
> in the setter). Also unmangle rounding and calculation of register value.
nitpick below
> 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>
> ---
> drivers/iio/light/vl6180.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
> index 6e25b724d941..57577d5d18ac 100644
> --- a/drivers/iio/light/vl6180.c
> +++ b/drivers/iio/light/vl6180.c
> @@ -386,16 +386,21 @@ static int vl6180_set_als_gain(struct vl6180_data *data, int val, int val2)
> 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 */
outer parenthesis not necessary
> + 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,15 +416,14 @@ 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;
>
> return vl6180_set_als_gain(data, val, val2);
> +
> default:
> return -EINVAL;
> }
>
--
Peter Meerwald-Stadler
Mobile: +43 664 24 44 418
[toc] | [prev] | [next] | [standalone]
| From | Jonathan Cameron <jic23@kernel.org> |
|---|---|
| Date | 2017-09-24 17:40 +0200 |
| Subject | Re: [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup |
| Message-ID | <uthaG-1ZI-19@gated-at.bofh.it> |
| In reply to | #1734675 |
On Tue, 19 Sep 2017 08:17:51 +0200 (CEST)
Peter Meerwald-Stadler <pmeerw@pmeerw.net> wrote:
> > This improves code uniformity (range checks for als_gain are also done
> > in the setter). Also unmangle rounding and calculation of register value.
>
> nitpick below
And another one from me...
Jonathan
>
> > 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>
> > ---
> > drivers/iio/light/vl6180.c | 18 +++++++++++-------
> > 1 file changed, 11 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
> > index 6e25b724d941..57577d5d18ac 100644
> > --- a/drivers/iio/light/vl6180.c
> > +++ b/drivers/iio/light/vl6180.c
> > @@ -386,16 +386,21 @@ static int vl6180_set_als_gain(struct vl6180_data *data, int val, int val2)
> > 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 */
>
> outer parenthesis not necessary
>
> > + 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,15 +416,14 @@ 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;
> >
> > return vl6180_set_als_gain(data, val, val2);
> > +
Unrelated white space changes shouldn't be in the same patch
as a real change. Please split them out.
> > default:
> > return -EINVAL;
> > }
> >
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web