Title: [9374] trunk/drivers/staging/iio: merge from upstream: staging: iio: tsl2563 move to new event numbering scheme and remove old definitions
- Revision
- 9374
- Author
- vapier
- Date
- 2010-10-24 16:53:34 -0400 (Sun, 24 Oct 2010)
Log Message
merge from upstream: staging: iio: tsl2563 move to new event numbering scheme and remove old definitions
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/light/light.h (9373 => 9374)
--- trunk/drivers/staging/iio/light/light.h 2010-10-24 20:53:30 UTC (rev 9373)
+++ trunk/drivers/staging/iio/light/light.h 2010-10-24 20:53:34 UTC (rev 9374)
@@ -2,6 +2,4 @@
/* Light to digital sensor attributes */
-#define IIO_EVENT_CODE_LIGHT_THRESH IIO_EVENT_CODE_LIGHT_BASE
-
Modified: trunk/drivers/staging/iio/light/tsl2563.c (9373 => 9374)
--- trunk/drivers/staging/iio/light/tsl2563.c 2010-10-24 20:53:30 UTC (rev 9373)
+++ trunk/drivers/staging/iio/light/tsl2563.c 2010-10-24 20:53:34 UTC (rev 9374)
@@ -706,8 +706,11 @@
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);
Modified: trunk/drivers/staging/iio/sysfs.h (9373 => 9374)
--- trunk/drivers/staging/iio/sysfs.h 2010-10-24 20:53:30 UTC (rev 9373)
+++ trunk/drivers/staging/iio/sysfs.h 2010-10-24 20:53:34 UTC (rev 9374)
@@ -300,7 +300,6 @@
#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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
