lkml.org 
[lkml]   [2020]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 2/5] iio: vcnl4000: Factorize data reading and writing.
    Date
    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@gmail.com>
    ---
    drivers/iio/light/vcnl4000.c | 24 ++++++++++++++++++++++--
    1 file changed, 22 insertions(+), 2 deletions(-)

    diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
    index e5f86bd00fb0..b976e29f2fda 100644
    --- a/drivers/iio/light/vcnl4000.c
    +++ b/drivers/iio/light/vcnl4000.c
    @@ -215,6 +215,27 @@ 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_swapped(data->client, data_reg);
    + if (ret < 0)
    + return ret;
    +
    + *val = ret;
    + return 0;
    +}
    +
    +static int vcnl4000_write_data(struct vcnl4000_data *data, u8 data_reg, int val)
    +{
    + if (val > U16_MAX)
    + return -ERANGE;
    +
    + return i2c_smbus_write_word_swapped(data->client, data_reg, val);
    +}
    +
    +
    static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
    u8 rdy_mask, u8 data_reg, int *val)
    {
    @@ -245,12 +266,11 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
    goto fail;
    }

    - ret = i2c_smbus_read_word_swapped(data->client, data_reg);
    + ret = vcnl4000_read_data(data, data_reg, val);
    if (ret < 0)
    goto fail;

    mutex_unlock(&data->vcnl4000_lock);
    - *val = ret;

    return 0;

    --
    2.26.0
    \
     
     \ /
      Last update: 2020-05-03 11:33    [W:4.310 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site