staging: iio: adc events update to new numbering system

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/adc.h b/drivers/staging/iio/adc/adc.h
index 953b5ce..4f13427 100644 (file)
--- a/drivers/staging/iio/adc/adc.h
+++ b/drivers/staging/iio/adc/adc.h
@@ -34,5 +34,9 @@
 #define IIO_CONST_ATTR_IN_NAMED_SCALE(_name, _string)                  \
        IIO_CONST_ATTR(in_##_name##_scale, _string)
 
-#define IIO_EVENT_CODE_IN_HIGH_THRESH(a) (IIO_EVENT_CODE_ADC_BASE  + a)
-#define IIO_EVENT_CODE_IN_LOW_THRESH(a) (IIO_EVENT_CODE_ADC_BASE  + a + 32)
+#define IIO_EVENT_CODE_IN_HIGH_THRESH(a)                               \
+       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, a, IIO_EV_TYPE_THRESH,    \
+                            IIO_EV_DIR_RISING)
+#define IIO_EVENT_CODE_IN_LOW_THRESH(a)                                     \
+       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, a, IIO_EV_TYPE_THRESH, \
+                            IIO_EV_DIR_FALLING)

diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 7707f8f..491c904 100644 (file)
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -285,7 +285,6 @@ struct iio_const_attr {
 #define IIO_EVENT_CODE_RING_BASE       200
 #define IIO_EVENT_CODE_ACCEL_BASE      300
 #define IIO_EVENT_CODE_GYRO_BASE       400
-#define IIO_EVENT_CODE_ADC_BASE                500
 #define IIO_EVENT_CODE_MISC_BASE       600
 #define IIO_EVENT_CODE_LIGHT_BASE      700