From 054da8f082c3f000248dffca2a1bf78b35f7f44a Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 8 Oct 2010 12:14:01 +0100 Subject: [PATCH] --- yaml --- r: 220181 b: refs/heads/master c: 820e882a873356aa8260c826d38b9a866ef30db4 h: refs/heads/master i: 220179: c95dbaf54e9ee4a5968d652f96706ab260777505 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/adc.h | 8 ++++++-- trunk/drivers/staging/iio/sysfs.h | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8ee5624cc628..020316119092 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4704d77fd1cbbc331af1e1fafd4c4f7fac1a744 +refs/heads/master: 820e882a873356aa8260c826d38b9a866ef30db4 diff --git a/trunk/drivers/staging/iio/adc/adc.h b/trunk/drivers/staging/iio/adc/adc.h index 953b5ceec3af..4f1342761983 100644 --- a/trunk/drivers/staging/iio/adc/adc.h +++ b/trunk/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/trunk/drivers/staging/iio/sysfs.h b/trunk/drivers/staging/iio/sysfs.h index 7707f8f9e55f..491c9043e414 100644 --- a/trunk/drivers/staging/iio/sysfs.h +++ b/trunk/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