From 749dcb8c5766f57f2e93384e82a4eeac8ab78008 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:42:17 +0100 Subject: [PATCH] --- yaml --- r: 249851 b: refs/heads/master c: d1ab8552cda68dd100cf113cba7bc37e653ad886 h: refs/heads/master i: 249849: 01c71f56501776b83714eda51c64d0a5bca1cad6 249847: 5eb429150cc08e46be58cf1116c82465a801676f v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/adt7410.c | 26 ++++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 15a6880da4eb..e9d74a3379a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7a2c3238345c88a668c26ec6790f19f4fa7a820 +refs/heads/master: d1ab8552cda68dd100cf113cba7bc37e653ad886 diff --git a/trunk/drivers/staging/iio/adc/adt7410.c b/trunk/drivers/staging/iio/adc/adt7410.c index c102b42e94f1..85b5c1acc631 100644 --- a/trunk/drivers/staging/iio/adc/adt7410.c +++ b/trunk/drivers/staging/iio/adc/adt7410.c @@ -355,14 +355,6 @@ static const struct attribute_group adt7410_attribute_group = { .attrs = adt7410_attributes, }; -/* - * temperature bound events - */ - -#define IIO_EVENT_CODE_ADT7410_ABOVE_ALARM IIO_BUFFER_EVENT_CODE(0) -#define IIO_EVENT_CODE_ADT7410_BELLOW_ALARM IIO_BUFFER_EVENT_CODE(1) -#define IIO_EVENT_CODE_ADT7410_ABOVE_CRIT IIO_BUFFER_EVENT_CODE(2) - static irqreturn_t adt7410_event_handler(int irq, void *private) { struct iio_dev *indio_dev = private; @@ -375,16 +367,22 @@ static irqreturn_t adt7410_event_handler(int irq, void *private) if (status & ADT7410_STAT_T_HIGH) iio_push_event(indio_dev, 0, - IIO_EVENT_CODE_ADT7410_ABOVE_ALARM, - timestamp); + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + timestamp); if (status & ADT7410_STAT_T_LOW) iio_push_event(indio_dev, 0, - IIO_EVENT_CODE_ADT7410_BELLOW_ALARM, - timestamp); + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_FALLING), + timestamp); if (status & ADT7410_STAT_T_CRIT) iio_push_event(indio_dev, 0, - IIO_EVENT_CODE_ADT7410_ABOVE_CRIT, - timestamp); + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + timestamp); return IRQ_HANDLED; }