From 5eb429150cc08e46be58cf1116c82465a801676f Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Wed, 18 May 2011 14:42:13 +0100
Subject: [PATCH] --- yaml --- r: 249847 b: refs/heads/master c:
 d91a0ab06ca27ec552233b5225e80661125fe1b2 h: refs/heads/master i:   249845:
 4de3edbd098a5c4c093d16dadaee3f9e5275451d   249843:
 9acdd7a440c66bd698e63a4130f885efbd5318ae   249839:
 9e82401d2b2f69047b57c4c0cc146644d85fce4c v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/iio/adc/ad7150.c | 31 ++++++++++++++++----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 03cc9047fae4..7e95d4aa8127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41c775240a78fac3e2bd7f024c3cf0d61547249e
+refs/heads/master: d91a0ab06ca27ec552233b5225e80661125fe1b2
diff --git a/trunk/drivers/staging/iio/adc/ad7150.c b/trunk/drivers/staging/iio/adc/ad7150.c
index cbd1f96188c3..e23bb9960019 100644
--- a/trunk/drivers/staging/iio/adc/ad7150.c
+++ b/trunk/drivers/staging/iio/adc/ad7150.c
@@ -642,11 +642,6 @@ static const struct attribute_group ad7150_attribute_group = {
  * threshold events
  */
 
-#define IIO_EVENT_CODE_CH1_HIGH    IIO_BUFFER_EVENT_CODE(0)
-#define IIO_EVENT_CODE_CH1_LOW     IIO_BUFFER_EVENT_CODE(1)
-#define IIO_EVENT_CODE_CH2_HIGH    IIO_BUFFER_EVENT_CODE(2)
-#define IIO_EVENT_CODE_CH2_LOW     IIO_BUFFER_EVENT_CODE(3)
-
 static irqreturn_t ad7150_event_handler(int irq, void *private)
 {
 	struct iio_dev *indio_dev = private;
@@ -658,21 +653,33 @@ static irqreturn_t ad7150_event_handler(int irq, void *private)
 
 	if ((int_status & AD7150_STATUS_OUT1) && !(chip->old_state & AD7150_STATUS_OUT1))
 		iio_push_event(indio_dev, 0,
-				IIO_EVENT_CODE_CH1_HIGH,
+			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,
+						    0,
+						    IIO_EV_TYPE_THRESH,
+						    IIO_EV_DIR_RISING),
 				timestamp);
 	else if ((!(int_status & AD7150_STATUS_OUT1)) && (chip->old_state & AD7150_STATUS_OUT1))
 		iio_push_event(indio_dev, 0,
-				IIO_EVENT_CODE_CH1_LOW,
-				timestamp);
+			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,
+						    0,
+						    IIO_EV_TYPE_THRESH,
+						    IIO_EV_DIR_FALLING),
+			       timestamp);
 
 	if ((int_status & AD7150_STATUS_OUT2) && !(chip->old_state & AD7150_STATUS_OUT2))
 		iio_push_event(indio_dev, 0,
-				IIO_EVENT_CODE_CH2_HIGH,
-				timestamp);
+			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,
+						    1,
+						    IIO_EV_TYPE_THRESH,
+						    IIO_EV_DIR_RISING),
+			       timestamp);
 	else if ((!(int_status & AD7150_STATUS_OUT2)) && (chip->old_state & AD7150_STATUS_OUT2))
 		iio_push_event(indio_dev, 0,
-				IIO_EVENT_CODE_CH2_LOW,
-				timestamp);
+			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,
+						    1,
+						    IIO_EV_TYPE_THRESH,
+						    IIO_EV_DIR_FALLING),
+			       timestamp);
 	return IRQ_HANDLED;
 }