lkml.org 
[lkml]   [2016]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 163/305] iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output
    3.16.37-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Matt Ranostay <mranostay@gmail.com>

    commit 5138806f16c74c7cb8ac3e408a859c79eb7c9567 upstream.

    IIO_CHAN_INFO_RAW was returning processed data which was incorrect.
    This also adds the IIO_CHAN_INFO_SCALE value to convert to a processed value.

    Signed-off-by: Matt Ranostay <mranostay@gmail.com>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 | 2 +-
    drivers/iio/proximity/as3935.c | 10 ++++++++--
    2 files changed, 9 insertions(+), 3 deletions(-)

    --- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
    +++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
    @@ -1,4 +1,4 @@
    -What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
    +What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
    Date: March 2014
    KernelVersion: 3.15
    Contact: Matt Ranostay <mranostay@gmail.com>
    --- a/drivers/iio/proximity/as3935.c
    +++ b/drivers/iio/proximity/as3935.c
    @@ -72,7 +72,8 @@ static const struct iio_chan_spec as3935
    .type = IIO_PROXIMITY,
    .info_mask_separate =
    BIT(IIO_CHAN_INFO_RAW) |
    - BIT(IIO_CHAN_INFO_PROCESSED),
    + BIT(IIO_CHAN_INFO_PROCESSED) |
    + BIT(IIO_CHAN_INFO_SCALE),
    .scan_index = 0,
    .scan_type = {
    .sign = 'u',
    @@ -181,7 +182,12 @@ static int as3935_read_raw(struct iio_de
    /* storm out of range */
    if (*val == AS3935_DATA_MASK)
    return -EINVAL;
    - *val *= 1000;
    +
    + if (m == IIO_CHAN_INFO_PROCESSED)
    + *val *= 1000;
    + break;
    + case IIO_CHAN_INFO_SCALE:
    + *val = 1000;
    break;
    default:
    return -EINVAL;
    \
     
     \ /
      Last update: 2016-09-17 09:56    [W:4.061 / U:0.960 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site