staging:iio:buffer - remove unused event code for buffer events.

These events are no longer passed up to userspace.

ad7745 - was using these events to indicate directly dataready
events.  I'm not sure when it ever makes sense to push these
to userspace so for now I've taken them to event codes 0 and 1
until someone has time to make this driver do something more
standard. (they were arbitary before, they still are, be it
in a different way!)

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/adc/ad7745.c b/drivers/staging/iio/adc/ad7745.c
index afa2648e08ff11da27a7d6d4038334a978981719..98b510dcecc85504ce22176154fd25bb46ff7a22 100644 (file)
--- a/drivers/staging/iio/adc/ad7745.c
+++ b/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/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 1ad9480fc694be4bd10fab636c93d28f0606e29c..4dc4ff0232a4b381e2a84d8d5712b2c44e32ab29 100644 (file)
--- a/drivers/staging/iio/iio.h
+++ b/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/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 9b855f3f5320f393186841d6de7940d496765451..dd79b58442123ebba25a7a337c64b25380f7ad2f 100644 (file)
--- a/drivers/staging/iio/sysfs.h
+++ b/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