From: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
To: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: jic23@kernel.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/4] iio: vcnl4000: Factorize data reading and writing.
Date: Mon, 20 Apr 2020 11:44:25 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.2004201142160.8178@vps.pmeerw.net> (raw)
In-Reply-To: <20200420084210.14245-2-m.othacehe@gmail.com>
On Mon, 20 Apr 2020, Mathieu Othacehe wrote:
> Factorize data reading in vcnl4000_measure into a vcnl4000_read_block_data
> function. Use it to provide a vcnl4000_read_data function that is able to
> read sensor data under lock. Also add a vcnl4000_write_data function.
comments below
> Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
> ---
> drivers/iio/light/vcnl4000.c | 54 +++++++++++++++++++++++++++++++++---
> 1 file changed, 50 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index 58e97462e803..4e87d2cf1100 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -215,11 +215,59 @@ static int vcnl4200_init(struct vcnl4000_data *data)
> return 0;
> };
>
> +static int vcnl4000_read_block_data(struct vcnl4000_data *data, u8 data_reg,
> + int *val)
> +{
> + __be16 buf;
> + int ret;
> +
> + ret = i2c_smbus_read_i2c_block_data(data->client,
> + data_reg, sizeof(buf), (u8 *) &buf);
> + if (ret < 0)
> + goto end;
> +
> + *val = be16_to_cpu(buf);
> +end:
> + return ret;
> +}
> +
> +static int vcnl4000_read_data(struct vcnl4000_data *data, u8 data_reg,
> + int *val)
> +{
> + int ret;
> +
> + mutex_lock(&data->vcnl4000_lock);
> + ret = vcnl4000_read_block_data(data, data_reg, val);
> + mutex_unlock(&data->vcnl4000_lock);
> +
> + return ret;
> +}
> +
> +static int vcnl4000_write_data(struct vcnl4000_data *data, u8 data_reg,
> + u16 val)
> +{
> + int ret;
> +
> + if (val > U16_MAX)
> + return -ERANGE;
> +
> + mutex_lock(&data->vcnl4000_lock);
> +
> + ret = i2c_smbus_write_byte_data(data->client, data_reg, val >> 8);
why not use i2c_smbus_write_word_data()?
> + if (ret < 0)
> + goto end;
> +
> + ret = i2c_smbus_write_byte_data(data->client, data_reg + 1, val);
> +end:
> + mutex_unlock(&data->vcnl4000_lock);
> +
> + return ret;
> +}
> +
> static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
> u8 rdy_mask, u8 data_reg, int *val)
> {
> int tries = 20;
> - __be16 buf;
> int ret;
>
> mutex_lock(&data->vcnl4000_lock);
> @@ -246,13 +294,11 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
> goto fail;
> }
>
> - ret = i2c_smbus_read_i2c_block_data(data->client,
> - data_reg, sizeof(buf), (u8 *) &buf);
> + ret = vcnl4000_read_block_data(data, data_reg, val);
> if (ret < 0)
> goto fail;
>
> mutex_unlock(&data->vcnl4000_lock);
> - *val = be16_to_cpu(buf);
>
> return 0;
>
>
--
Peter Meerwald-Stadler
Mobile: +43 664 24 44 418
next prev parent reply other threads:[~2020-04-20 9:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 8:42 [PATCH v3 0/4] iio: vcnl: Add interrupts support for VCNL4010/20 Mathieu Othacehe
2020-04-20 8:42 ` [PATCH v3 1/4] iio: vcnl4000: Factorize data reading and writing Mathieu Othacehe
2020-04-20 9:44 ` Peter Meerwald-Stadler [this message]
2020-04-21 0:36 ` Andy Shevchenko
2020-04-20 8:42 ` [PATCH v3 2/4] iio: vcnl4000: Add event support for VCNL4010/20 Mathieu Othacehe
2020-04-20 9:58 ` Peter Meerwald-Stadler
2020-04-21 0:41 ` Andy Shevchenko
2020-04-20 8:42 ` [PATCH v3 3/4] iio: vcnl4000: Add sampling frequency " Mathieu Othacehe
2020-04-20 10:03 ` Peter Meerwald-Stadler
2020-04-21 0:44 ` Andy Shevchenko
2020-04-20 8:42 ` [PATCH v3 4/4] iio: vcnl4000: Add buffer " Mathieu Othacehe
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.21.2004201142160.8178@vps.pmeerw.net \
--to=pmeerw@pmeerw.net \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.othacehe@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).