From: Michael Hennerich <michael.hennerich@analog.com>
Date: Fri, 2 Sep 2011 16:25:42 +0000 (+0100)
Subject: staging:iio:adc:ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly
X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~696
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b576590dcd4ef4774b155540e392491afb1d1da0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index d125af0ccf59..840353624a76 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 12152461ca53..174f2c6bf3f4 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)