Skip to content

Commit

Permalink
iio: potentiometer: ds1803: Add device specific read_raw function
Browse files Browse the repository at this point in the history
Added function pointer in the device specific structure to
call the appropriate device read_raw function, so that the
other type of devices with different read method can be
handled.

Signed-off-by: Jagath Jog J <jagathjog1996@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220223163525.13399-6-jagathjog1996@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  • Loading branch information
Jagath Jog J authored and Jonathan Cameron committed Feb 26, 2022
1 parent 6450b62 commit 9b68725
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions drivers/iio/potentiometer/ds1803.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ struct ds1803_cfg {
int kohms;
const struct iio_chan_spec *channels;
u8 num_channels;
int (*read)(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, int *val);
};

struct ds1803_data {
Expand All @@ -55,27 +57,46 @@ static const struct iio_chan_spec ds1803_channels[] = {
DS1803_CHANNEL(1, DS1803_WIPER_1),
};

static int ds1803_read(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val)
{
struct ds1803_data *data = iio_priv(indio_dev);
int ret;
u8 result[ARRAY_SIZE(ds1803_channels)];

ret = i2c_master_recv(data->client, result, indio_dev->num_channels);
if (ret < 0)
return ret;

*val = result[chan->channel];
return ret;
}

static const struct ds1803_cfg ds1803_cfg[] = {
[DS1803_010] = {
.wipers = 2,
.avail = { 0, 1, 255 },
.kohms = 10,
.channels = ds1803_channels,
.num_channels = ARRAY_SIZE(ds1803_channels),
.read = ds1803_read,
},
[DS1803_050] = {
.wipers = 2,
.avail = { 0, 1, 255 },
.kohms = 50,
.channels = ds1803_channels,
.num_channels = ARRAY_SIZE(ds1803_channels),
.read = ds1803_read,
},
[DS1803_100] = {
.wipers = 2,
.avail = { 0, 1, 255 },
.kohms = 100,
.channels = ds1803_channels,
.num_channels = ARRAY_SIZE(ds1803_channels),
.read = ds1803_read,
},
};

Expand All @@ -84,18 +105,14 @@ static int ds1803_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long mask)
{
struct ds1803_data *data = iio_priv(indio_dev);
int pot = chan->channel;
int ret;
u8 result[ARRAY_SIZE(ds1803_channels)];

switch (mask) {
case IIO_CHAN_INFO_RAW:
ret = i2c_master_recv(data->client, result,
indio_dev->num_channels);
ret = data->cfg->read(indio_dev, chan, val);
if (ret < 0)
return ret;

*val = result[pot];
return IIO_VAL_INT;

case IIO_CHAN_INFO_SCALE:
Expand Down

0 comments on commit 9b68725

Please sign in to comment.