aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-05-18 09:42:19 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-19 19:15:01 -0400
commit02db0bb33acf8afbdb9fb4fbaa99f7185337098f (patch)
treef617acf0a309a9ef8529df28b9db111966dbbd39 /drivers
parent383f650f6cf739b256eb24c4a1d397d883de56ff (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/adc/ad7745.c4
-rw-r--r--drivers/staging/iio/iio.h4
-rw-r--r--drivers/staging/iio/sysfs.h1
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/iio/adc/ad7745.c b/drivers/staging/iio/adc/ad7745.c
index afa2648e08ff..98b510dcecc8 100644
--- 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 = {
522 * data ready events 522 * data ready events
523 */ 523 */
524 524
525#define IIO_EVENT_CODE_CAP_RDY IIO_BUFFER_EVENT_CODE(0) 525#define IIO_EVENT_CODE_CAP_RDY 0
526#define IIO_EVENT_CODE_VT_RDY IIO_BUFFER_EVENT_CODE(1) 526#define IIO_EVENT_CODE_VT_RDY 1
527 527
528#define IIO_EVENT_ATTR_CAP_RDY_SH(_evlist, _show, _store, _mask) \ 528#define IIO_EVENT_ATTR_CAP_RDY_SH(_evlist, _show, _store, _mask) \
529 IIO_EVENT_ATTR_SH(cap_rdy, _evlist, _show, _store, _mask) 529 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 1ad9480fc694..4dc4ff0232a4 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -28,10 +28,6 @@
28/* naughty temporary hack to match these against the event version 28/* naughty temporary hack to match these against the event version
29 - need to flattern these together */ 29 - need to flattern these together */
30enum iio_chan_type { 30enum iio_chan_type {
31 /* Need this here for now to support buffer events
32 * set to 0 to avoid changes to ring_generic.c */
33 IIO_BUFFER = 0,
34
35 /* real channel types */ 31 /* real channel types */
36 IIO_IN, 32 IIO_IN,
37 IIO_CURRENT, 33 IIO_CURRENT,
diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 9b855f3f5320..dd79b5844212 100644
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -170,7 +170,6 @@ struct iio_const_attr {
170#define IIO_EV_CLASS_LIGHT IIO_LIGHT 170#define IIO_EV_CLASS_LIGHT IIO_LIGHT
171#define IIO_EV_CLASS_PROXIMITY IIO_PROXIMITY 171#define IIO_EV_CLASS_PROXIMITY IIO_PROXIMITY
172#define IIO_EV_CLASS_TEMP IIO_TEMP 172#define IIO_EV_CLASS_TEMP IIO_TEMP
173#define IIO_EV_CLASS_BUFFER IIO_BUFFER
174 173
175#define IIO_EV_MOD_X IIO_MOD_X 174#define IIO_EV_MOD_X IIO_MOD_X
176#define IIO_EV_MOD_Y IIO_MOD_Y 175#define IIO_EV_MOD_Y IIO_MOD_Y