Title: [9370] trunk/drivers/staging/iio: merge from upstream: staging: iio: adc events update to new numbering system
- Revision
- 9370
- Author
- vapier
- Date
- 2010-10-24 16:53:18 -0400 (Sun, 24 Oct 2010)
Log Message
merge from upstream: staging: iio: adc events update to new numbering system
From: Jonathan Cameron <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/adc/adc.h (9369 => 9370)
--- trunk/drivers/staging/iio/adc/adc.h 2010-10-24 20:53:14 UTC (rev 9369)
+++ trunk/drivers/staging/iio/adc/adc.h 2010-10-24 20:53:18 UTC (rev 9370)
@@ -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)
Modified: trunk/drivers/staging/iio/sysfs.h (9369 => 9370)
--- trunk/drivers/staging/iio/sysfs.h 2010-10-24 20:53:14 UTC (rev 9369)
+++ trunk/drivers/staging/iio/sysfs.h 2010-10-24 20:53:18 UTC (rev 9370)
@@ -291,7 +291,6 @@
#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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
