From eb32106a991b7a79f39e28087161320f6d19c49f Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:42:16 +0100 Subject: [PATCH] --- yaml --- r: 249850 b: refs/heads/master c: e7a2c3238345c88a668c26ec6790f19f4fa7a820 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/adt7310.c | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index e6a72d690154..15a6880da4eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b206c3bbb4eda4f82c3396c0cc3a4443ffc166c5 +refs/heads/master: e7a2c3238345c88a668c26ec6790f19f4fa7a820 diff --git a/trunk/drivers/staging/iio/adc/adt7310.c b/trunk/drivers/staging/iio/adc/adt7310.c index 2ade48537e97..e405fc311d4d 100644 --- a/trunk/drivers/staging/iio/adc/adt7310.c +++ b/trunk/drivers/staging/iio/adc/adt7310.c @@ -387,14 +387,6 @@ static const struct attribute_group adt7310_attribute_group = { .attrs = adt7310_attributes, }; -/* - * temperature bound events - */ - -#define IIO_EVENT_CODE_ADT7310_ABOVE_ALARM IIO_BUFFER_EVENT_CODE(0) -#define IIO_EVENT_CODE_ADT7310_BELLOW_ALARM IIO_BUFFER_EVENT_CODE(1) -#define IIO_EVENT_CODE_ADT7310_ABOVE_CRIT IIO_BUFFER_EVENT_CODE(2) - static irqreturn_t adt7310_event_handler(int irq, void *private) { struct iio_dev *indio_dev = private; @@ -409,15 +401,21 @@ static irqreturn_t adt7310_event_handler(int irq, void *private) if (status & ADT7310_STAT_T_HIGH) iio_push_event(indio_dev, 0, - IIO_EVENT_CODE_ADT7310_ABOVE_ALARM, - timestamp); + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + timestamp); if (status & ADT7310_STAT_T_LOW) iio_push_event(indio_dev, 0, - IIO_EVENT_CODE_ADT7310_BELLOW_ALARM, - timestamp); + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_FALLING), + timestamp); if (status & ADT7310_STAT_T_CRIT) iio_push_event(indio_dev, 0, - IIO_EVENT_CODE_ADT7310_ABOVE_CRIT, + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), timestamp); return IRQ_HANDLED; }