diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-09-28 05:31:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-10-01 11:19:09 -0400 |
commit | 54ea14339ddd28b935773d65257024757c9358d5 (patch) | |
tree | 1a96cd4d43499916933435e4029d1281ff0513dc /drivers/iio/dac | |
parent | 0a99b6014343e39d7e01ebfc386fb16c8a5a6826 (diff) |
iio:ad5504: Report scale as fractional value
Move the complexity of calculating the fixed point scale to the core.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/dac')
-rw-r--r-- | drivers/iio/dac/ad5504.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 31f4ff29f914..c0957a918e17 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c | |||
@@ -100,7 +100,6 @@ static int ad5504_read_raw(struct iio_dev *indio_dev, | |||
100 | long m) | 100 | long m) |
101 | { | 101 | { |
102 | struct ad5504_state *st = iio_priv(indio_dev); | 102 | struct ad5504_state *st = iio_priv(indio_dev); |
103 | unsigned long scale_uv; | ||
104 | int ret; | 103 | int ret; |
105 | 104 | ||
106 | switch (m) { | 105 | switch (m) { |
@@ -113,11 +112,9 @@ static int ad5504_read_raw(struct iio_dev *indio_dev, | |||
113 | 112 | ||
114 | return IIO_VAL_INT; | 113 | return IIO_VAL_INT; |
115 | case IIO_CHAN_INFO_SCALE: | 114 | case IIO_CHAN_INFO_SCALE: |
116 | scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits; | 115 | *val = st->vref_mv; |
117 | *val = scale_uv / 1000; | 116 | *val2 = chan->scan_type.realbits; |
118 | *val2 = (scale_uv % 1000) * 1000; | 117 | return IIO_VAL_FRACTIONAL_LOG2; |
119 | return IIO_VAL_INT_PLUS_MICRO; | ||
120 | |||
121 | } | 118 | } |
122 | return -EINVAL; | 119 | return -EINVAL; |
123 | } | 120 | } |