From: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
To: "Stefan Brüns" <stefan.bruens@rwth-aachen.de>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: Re: [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup
Date: Tue, 19 Sep 2017 08:17:51 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1709190817310.8589@vps.pmeerw.net> (raw)
In-Reply-To: <20170919031144.4968-2-stefan.bruens@rwth-aachen.de>
[-- Attachment #1: Type: text/plain, Size: 1979 bytes --]
> 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
next prev parent reply other threads:[~2017-09-19 6:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-19 3:11 [PATCH 0/4] iio: light: vl6180: Several fixes and enhancements Stefan Brüns
2017-09-19 3:11 ` [PATCH 1/4] iio: light: vl6180: Move range check to integration time setter, cleanup Stefan Brüns
2017-09-19 6:17 ` Peter Meerwald-Stadler [this message]
2017-09-24 15:34 ` Jonathan Cameron
2017-09-19 3:11 ` [PATCH 2/4] iio: light: vl6180: Avoid readback of integration time register Stefan Brüns
2017-09-24 15:36 ` Jonathan Cameron
2017-09-19 3:11 ` [PATCH 3/4] iio: light: vl6180: Cleanup als_gain lookup, avoid register readback Stefan Brüns
2017-09-19 6:17 ` Peter Meerwald-Stadler
2017-09-19 3:11 ` [PATCH 4/4] iio: light: vl6180: Correct ALS scale for non-default gain/integration time Stefan Brüns
2017-09-24 15:40 ` [PATCH 0/4] iio: light: vl6180: Several fixes and enhancements Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1709190817310.8589@vps.pmeerw.net \
--to=pmeerw@pmeerw.net \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stefan.bruens@rwth-aachen.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®