From 2b6a9b9ea7e15a3ea7afd8e0078d9f9c6840c85c Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:42:19 +0100 Subject: [PATCH] --- yaml --- r: 249853 b: refs/heads/master c: 02db0bb33acf8afbdb9fb4fbaa99f7185337098f h: refs/heads/master i: 249851: 749dcb8c5766f57f2e93384e82a4eeac8ab78008 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/ad7745.c | 4 ++-- trunk/drivers/staging/iio/iio.h | 4 ---- trunk/drivers/staging/iio/sysfs.h | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8b4812d81544..397245cc494d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 383f650f6cf739b256eb24c4a1d397d883de56ff +refs/heads/master: 02db0bb33acf8afbdb9fb4fbaa99f7185337098f diff --git a/trunk/drivers/staging/iio/adc/ad7745.c b/trunk/drivers/staging/iio/adc/ad7745.c index afa2648e08ff..98b510dcecc8 100644 --- a/trunk/drivers/staging/iio/adc/ad7745.c +++ b/trunk/drivers/staging/iio/adc/ad7745.c @@ -522,8 +522,8 @@ static const struct attribute_group ad774x_attribute_group = { * data ready events */ -#define IIO_EVENT_CODE_CAP_RDY IIO_BUFFER_EVENT_CODE(0) -#define IIO_EVENT_CODE_VT_RDY IIO_BUFFER_EVENT_CODE(1) +#define IIO_EVENT_CODE_CAP_RDY 0 +#define IIO_EVENT_CODE_VT_RDY 1 #define IIO_EVENT_ATTR_CAP_RDY_SH(_evlist, _show, _store, _mask) \ IIO_EVENT_ATTR_SH(cap_rdy, _evlist, _show, _store, _mask) diff --git a/trunk/drivers/staging/iio/iio.h b/trunk/drivers/staging/iio/iio.h index 1ad9480fc694..4dc4ff0232a4 100644 --- a/trunk/drivers/staging/iio/iio.h +++ b/trunk/drivers/staging/iio/iio.h @@ -28,10 +28,6 @@ /* naughty temporary hack to match these against the event version - need to flattern these together */ enum iio_chan_type { - /* Need this here for now to support buffer events - * set to 0 to avoid changes to ring_generic.c */ - IIO_BUFFER = 0, - /* real channel types */ IIO_IN, IIO_CURRENT, diff --git a/trunk/drivers/staging/iio/sysfs.h b/trunk/drivers/staging/iio/sysfs.h index 9b855f3f5320..dd79b5844212 100644 --- a/trunk/drivers/staging/iio/sysfs.h +++ b/trunk/drivers/staging/iio/sysfs.h @@ -170,7 +170,6 @@ struct iio_const_attr { #define IIO_EV_CLASS_LIGHT IIO_LIGHT #define IIO_EV_CLASS_PROXIMITY IIO_PROXIMITY #define IIO_EV_CLASS_TEMP IIO_TEMP -#define IIO_EV_CLASS_BUFFER IIO_BUFFER #define IIO_EV_MOD_X IIO_MOD_X #define IIO_EV_MOD_Y IIO_MOD_Y