From: Jonathan Cameron Date: Fri, 8 Oct 2010 11:14:05 +0000 (+0100) Subject: staging: iio: tsl2563 move to new event numbering scheme and remove old definitions X-Git-Tag: v2.6.37-rc1~60^2~3^2~262 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=da1d8b68af7ccf0ed1eae587c57c5ef62a63a591 staging: iio: tsl2563 move to new event numbering scheme and remove old definitions Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/light/light.h b/drivers/staging/iio/light/light.h index e4e1e2c4139c..83286581f8f0 100644 --- 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 98f8b78f5d8c..98149e136a26 100644 --- 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 206400921ee5..116dacf51d1a 100644 --- 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