On Wed, 22 Apr 2020 15:08:53 +0200
Mathieu Othacehe <m.othacehe@xxxxxxxxx> wrote:
> Factorize data reading in vcnl4000_measure into a vcnl4000_read_data
> function. Also add a vcnl4000_write_data function.
>
> Signed-off-by: Mathieu Othacehe <m.othacehe@xxxxxxxxx>
> ---
> drivers/iio/light/vcnl4000.c | 29 +++++++++++++++++++++++++----
> 1 file changed, 25 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index 58e97462e803..695a81e95d8d 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -215,11 +215,34 @@ static int vcnl4200_init(struct vcnl4000_data *data)
> return 0;
> };
>
> +static int vcnl4000_read_data(struct vcnl4000_data *data, u8 data_reg, int *val)
> +{
> + s32 ret;
> +
> + ret = i2c_smbus_read_word_data(data->client, data_reg);
> + if (ret < 0)
> + return ret;
> +
> + *val = be16_to_cpu(ret);
> + return 0;
> +}
> +
> +static int vcnl4000_write_data(struct vcnl4000_data *data, u8 data_reg, int val)
> +{
> + __be16 be_val;
> +
> + if (val > U16_MAX)
> + return -ERANGE;
> +
> + be_val = cpu_to_be16(val);
> + return i2c_smbus_write_word_data(data->client, data_reg, be_val);
> +}
> +
> +
Nitpick: One line is plenty. I can tidy this up whilst applying if
we don't go to v6 for other reasons.
Otherwise this looks fine.
Jonathan
> 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 +269,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_data(data, data_reg, val);
> if (ret < 0)
> goto fail;
>
> mutex_unlock(&data->vcnl4000_lock);
> - *val = be16_to_cpu(buf);
>
> return 0;
>
