diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2011-09-02 16:25:42 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 23:03:36 (GMT) |
| commit | b576590dcd4ef4774b155540e392491afb1d1da0 (patch) | |
| tree | e151deba023c3a43fcdc94cb08808af3075f8a7d | |
| parent | 94c93dbde974b074a4301fb7c44f9dbb04da8712 (diff) | |
| download | linux-fsl-qoriq-b576590dcd4ef4774b155540e392491afb1d1da0.tar.xz | |
staging:iio:adc:ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly
Fix channel type handling
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/iio/adc/ad7291.c | 6 | ||||
| -rw-r--r-- | drivers/staging/iio/sysfs.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c index d125af0..8403536 100644 --- a/drivers/staging/iio/adc/ad7291.c +++ b/drivers/staging/iio/adc/ad7291.c @@ -314,7 +314,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev, u16 uval; s16 signval; - switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) { + switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) { case IIO_VOLTAGE: reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)] [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) == @@ -350,7 +350,7 @@ static int ad7291_write_event_value(struct iio_dev *indio_dev, u8 reg; s16 signval; - switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) { + switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) { case IIO_VOLTAGE: if (val > 0xFFF || val < 0) return -EINVAL; @@ -378,7 +378,7 @@ static int ad7291_read_event_config(struct iio_dev *indio_dev, /* To be enabled the channel must simply be on. If any are enabled we are in continuous sampling mode */ - switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) { + switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) { case IIO_VOLTAGE: if (chip->c_mask & (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code))) diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h index 1215246..174f2c6 100644 --- a/drivers/staging/iio/sysfs.h +++ b/drivers/staging/iio/sysfs.h @@ -146,8 +146,11 @@ enum iio_event_direction { IIO_EVENT_CODE(channelclass, 0, 0, direction, type, number, 0, 0) #define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF) + #define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF) +#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF) + /* Event code number extraction depends on which type of event we have. * Perhaps review this function in the future*/ #define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF) |