staging:iio:ad7280a: Report scale as fractional value
authorLars-Peter Clausen <lars@metafoo.de>
Sat, 28 Sep 2013 09:31:00 +0000 (10:31 +0100)
committerJonathan Cameron <jic23@kernel.org>
Tue, 1 Oct 2013 15:19:13 +0000 (16:19 +0100)
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>
drivers/staging/iio/adc/ad7280a.c

index e7191e44a970faebada245611359dcc6ab99b49b..8209fa542a8a00275103d87585f415d281a69781 100644 (file)
@@ -783,7 +783,6 @@ static int ad7280_read_raw(struct iio_dev *indio_dev,
                           long m)
 {
        struct ad7280_state *st = iio_priv(indio_dev);
-       unsigned int scale_uv;
        int ret;
 
        switch (m) {
@@ -804,13 +803,12 @@ static int ad7280_read_raw(struct iio_dev *indio_dev,
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                if ((chan->address & 0xFF) <= AD7280A_CELL_VOLTAGE_6)
-                       scale_uv = (4000 * 1000) >> AD7280A_BITS;
+                       *val = 4000;
                else
-                       scale_uv = (5000 * 1000) >> AD7280A_BITS;
+                       *val = 5000;
 
-               *val =  scale_uv / 1000;
-               *val2 = (scale_uv % 1000) * 1000;
-               return IIO_VAL_INT_PLUS_MICRO;
+               *val2 = AD7280A_BITS;
+               return IIO_VAL_FRACTIONAL_LOG2;
        }
        return -EINVAL;
 }