From 820e882a873356aa8260c826d38b9a866ef30db4 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 8 Oct 2010 12:14:01 +0100 Subject: [PATCH] staging: iio: adc events update to new numbering system Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/adc/adc.h | 8 ++++++-- drivers/staging/iio/sysfs.h | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/adc/adc.h b/drivers/staging/iio/adc/adc.h index 953b5ceec3a..4f134276198 100644 --- 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 7707f8f9e55..491c9043e41 100644 --- 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 -- 2.11.4.GIT