staging: iio: tsl2563 move to new event numbering scheme and remove old definitions

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/light/light.h b/drivers/staging/iio/light/light.h
index e4e1e2c4139ca94d769c521ceff21570ede30f9c..83286581f8f05536da1c99132802e5526e679ab4 100644 (file)
--- a/drivers/staging/iio/light/light.h
+++ b/drivers/staging/iio/light/light.h
@@ -2,6 +2,4 @@
 
 /* Light to digital sensor attributes */
 
-#define IIO_EVENT_CODE_LIGHT_THRESH IIO_EVENT_CODE_LIGHT_BASE
-
 

diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index 98f8b78f5d8c1b2288964043849d8e3d007bce3e..98149e136a26de4465db73ef0ce2c2427221c0f0 100644 (file)
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -706,8 +706,11 @@ static void tsl2563_int_bh(struct work_struct *work_s)
        u8 cmd = TSL2563_CMD | TSL2563_CLEARINT;
 
        iio_push_event(chip->indio_dev, 0,
-               IIO_EVENT_CODE_LIGHT_BASE,
-               chip->event_timestamp);
+                      IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_LIGHT,
+                                           0,
+                                           IIO_EV_TYPE_THRESH,
+                                           IIO_EV_DIR_EITHER),
+                      chip->event_timestamp);
 
        /* reenable_irq */
        enable_irq(chip->client->irq);

diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 206400921ee544f1d1736b86a3c946ba6e219e2b..116dacf51d1a79c63a6954dd94ee69ccc2aee06f 100644 (file)
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -294,7 +294,6 @@ struct iio_const_attr {
 #define IIO_EVENT_CODE_ACCEL_BASE      300
 #define IIO_EVENT_CODE_GYRO_BASE       400
 #define IIO_EVENT_CODE_MISC_BASE       600
-#define IIO_EVENT_CODE_LIGHT_BASE      700
 
 #define IIO_EVENT_CODE_DEVICE_SPECIFIC 1000