diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-01-11 11:48:39 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2017-01-14 12:20:18 +0000 |
| commit | adc8ec5ff183d09ae7a9d2dd31125401d302ba63 (patch) | |
| tree | e17f98d63f63971e268176057333bf21ea20ef62 /drivers/iio/inkern.c | |
| parent | 948b707df8d2493346f7a2979632ab5ae8b8abb6 (diff) | |
| download | linux-adc8ec5ff183d09ae7a9d2dd31125401d302ba63.tar.bz2 | |
iio: inkern: pass through raw values if no scaling
When a consumer calls iio_read_channel_processed() the IIO core
tries to apply scaling to the value, but if the channel only
supports reading raw values, we should return that raw value
to the cosumer instead of an error.
This is what userspace is expected to do with sensors only
providing raw values so the kernel should do the same, so as to
avoid adding scaling boilerplate to drivers for hardware that
actually return processed values from raw reads.
A sensor not providing a scale, but providing a _raw attribute
could be valid if for example the scale is the default of 1,
but an offset needs to be applied to convert to the _processed
form.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/inkern.c')
| -rw-r--r-- | drivers/iio/inkern.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index b0f4630a163f..7a13535dc3e9 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -601,8 +601,14 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan, scale_type = iio_channel_read(chan, &scale_val, &scale_val2, IIO_CHAN_INFO_SCALE); - if (scale_type < 0) - return scale_type; + if (scale_type < 0) { + /* + * Just pass raw values as processed if no scaling is + * available. + */ + *processed = raw; + return 0; + } switch (scale_type) { case IIO_VAL_INT: |