staging:iio:light Add IIO_CHAN_INFO_RAW/PROCESSED entries to all drivers.

Precursor to making value read / write attribute optional.
Note that minimal change route taken here. The read_raw callbacks
in both drivers could do fewer checks to identify the channel than
they now do.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 38ec52b65dfa765bc48f6b30252f550fcb17ff14..350f12c98ae5692aeb1e7d90de37704cc1026586 100644 (file)
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -383,7 +383,8 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
 
        mutex_lock(&chip->lock);
        switch (mask) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
+       case IIO_CHAN_INFO_PROCESSED:
                switch (chan->type) {
                case IIO_LIGHT:
                        ret = isl29018_read_lux(client, val);
@@ -420,14 +421,17 @@ static const struct iio_chan_spec isl29018_channels[] = {
                .indexed = 1,
                .channel = 0,
                .processed_val = IIO_PROCESSED,
-               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
+               .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
        }, {
                .type = IIO_INTENSITY,
                .modified = 1,
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
                .channel2 = IIO_MOD_LIGHT_IR,
        }, {
                /* Unindexed in current ABI.  But perhaps it should be. */
                .type = IIO_PROXIMITY,
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
        }
 };
 

diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index beb51d7122cd778c402b0c13b4e50401c6f20d36..a334a889339d578ac040e35b728ac9d244c18d46 100644 (file)
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -485,7 +485,8 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev,
 
        mutex_lock(&chip->lock);
        switch (m) {
-       case 0:
+       case IIO_CHAN_INFO_RAW:
+       case IIO_CHAN_INFO_PROCESSED:
                switch (chan->type) {
                case IIO_LIGHT:
                        ret = tsl2563_get_adc(chip);
@@ -535,12 +536,14 @@ static const struct iio_chan_spec tsl2563_channels[] = {
                .type = IIO_LIGHT,
                .indexed = 1,
                .processed_val = 1,
+               .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT,
                .channel = 0,
        }, {
                .type = IIO_INTENSITY,
                .modified = 1,
                .channel2 = IIO_MOD_LIGHT_BOTH,
-               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
                .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
                                          IIO_EV_DIR_RISING) |
                               IIO_EV_BIT(IIO_EV_TYPE_THRESH,
@@ -549,7 +552,8 @@ static const struct iio_chan_spec tsl2563_channels[] = {
                .type = IIO_INTENSITY,
                .modified = 1,
                .channel2 = IIO_MOD_LIGHT_IR,
-               .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
+               .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
+               IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
        }
 };