[Linux-kernel-commits] [9373] trunk/drivers/staging/iio/accel/accel.h: merge from upstream: staging: iio: accel remove old event codes

Sun, 24 Oct 2010 13:53:39 -0700

Title: [9373] trunk/drivers/staging/iio/accel/accel.h: merge from upstream: staging: iio: accel remove old event codes
Revision
9373
Author
vapier
Date
2010-10-24 16:53:30 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: accel remove old event codes

From: Jonathan Cameron <[email protected]>

Signed-off-by: Joanthan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/accel/accel.h (9372 => 9373)


--- trunk/drivers/staging/iio/accel/accel.h	2010-10-24 20:53:26 UTC (rev 9372)
+++ trunk/drivers/staging/iio/accel/accel.h	2010-10-24 20:53:30 UTC (rev 9373)
@@ -141,83 +141,56 @@
 /**
  * IIO_EVENT_CODE_ACCEL_X_HIGH - event code for x axis high accel threshold
  **/
-#define IIO_EVENT_CODE_ACCEL_X_HIGH IIO_EVENT_CODE_ACCEL_BASE
-
 #define IIO_EVENT_ATTR_ACCEL_Y_HIGH(_show, _store, _mask, _handler)	\
 	IIO_EVENT_ATTR(accel_y_high, _show, _store, _mask, _handler)
 
 #define IIO_EVENT_ATTR_ACCEL_Y_HIGH_SH(_evlist, _show, _store, _mask)	\
 	IIO_EVENT_ATTR_SH(accel_y_high, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Y_HIGH (IIO_EVENT_CODE_ACCEL_BASE + 1)
-
 #define IIO_EVENT_ATTR_ACCEL_Z_HIGH(_show, _store, _mask, _handler)	\
 	IIO_EVENT_ATTR(accel_z_high, _show, _store, _mask, _handler)
 
 #define IIO_EVENT_ATTR_ACCEL_Z_HIGH_SH(_evlist, _show, _store, _mask)	\
 	IIO_EVENT_ATTR_SH(accel_z_high, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Z_HIGH (IIO_EVENT_CODE_ACCEL_BASE + 2)
-
 #define IIO_EVENT_ATTR_ACCEL_X_LOW(_show, _store, _mask, _handler)	\
 	IIO_EVENT_ATTR(accel_x_low, _show, _store, _mask, _handler)
 
 #define IIO_EVENT_ATTR_ACCEL_X_LOW_SH(_evlist, _show, _store, _mask)	\
 	IIO_EVENT_ATTR_SH(accel_x_low, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_X_LOW (IIO_EVENT_CODE_ACCEL_BASE + 3)
-
 #define IIO_EVENT_ATTR_ACCEL_Y_LOW(_show, _store, _mask, _handler) \
 	IIO_EVENT_ATTR(accel_y_low, _show, _store, _mask, _handler)
 
 #define IIO_EVENT_ATTR_ACCEL_Y_LOW_SH(_evlist, _show, _store, _mask)\
 	IIO_EVENT_ATTR_SH(accel_y_low, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Y_LOW (IIO_EVENT_CODE_ACCEL_BASE + 4)
-
 #define IIO_EVENT_ATTR_ACCEL_Z_LOW(_show, _store, _mask, _handler)	\
 	IIO_EVENT_ATTR(accel_z_low, _show, _store, _mask, _handler)
 
 #define IIO_EVENT_ATTR_ACCEL_Z_LOW_SH(_evlist, _show, _store, _mask)	\
 	IIO_EVENT_ATTR_SH(accel_z_low, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Z_LOW (IIO_EVENT_CODE_ACCEL_BASE + 5)
-
 #define IIO_EVENT_ATTR_FREE_FALL_DETECT(_show, _store, _mask, _handler)	\
 	IIO_EVENT_ATTR(free_fall, _show, _store, _mask, _handler)
 
 #define IIO_EVENT_ATTR_FREE_FALL_DETECT_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(free_fall, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_FREE_FALL (IIO_EVENT_CODE_ACCEL_BASE + 6)
-
-
 #define IIO_EVENT_ATTR_ACCEL_X_ROC_HIGH_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(accel_x_roc_high, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_X_ROC_HIGH (IIO_EVENT_CODE_ACCEL_BASE + 10)
-
 #define IIO_EVENT_ATTR_ACCEL_X_ROC_LOW_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(accel_x_roc_low, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_X_ROC_LOW (IIO_EVENT_CODE_ACCEL_BASE + 11)
-
 #define IIO_EVENT_ATTR_ACCEL_Y_ROC_HIGH_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(accel_y_roc_high, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Y_ROC_HIGH (IIO_EVENT_CODE_ACCEL_BASE + 12)
-
 #define IIO_EVENT_ATTR_ACCEL_Y_ROC_LOW_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(accel_y_roc_low, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Y_ROC_LOW (IIO_EVENT_CODE_ACCEL_BASE + 13)
-
 #define IIO_EVENT_ATTR_ACCEL_Z_ROC_HIGH_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(accel_z_roc_high, _evlist, _show, _store, _mask)
 
-#define IIO_EVENT_CODE_ACCEL_Z_ROC_HIGH (IIO_EVENT_CODE_ACCEL_BASE + 14)
-
 #define IIO_EVENT_ATTR_ACCEL_Z_ROC_LOW_SH(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(accel_z_roc_low, _evlist, _show, _store, _mask)
-
-#define IIO_EVENT_CODE_ACCEL_Z_ROC_LOW (IIO_EVENT_CODE_ACCEL_BASE + 15)

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to