diff options
| author | Jonathan Cameron | 2011-05-18 15:42:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-05-20 01:15:01 +0200 |
| commit | 02db0bb33acf8afbdb9fb4fbaa99f7185337098f (patch) | |
| tree | f617acf0a309a9ef8529df28b9db111966dbbd39 /drivers/staging | |
| parent | staging:iio:addac:adt7316 replace abuse of buffer events. (diff) | |
| download | kernel-qcow2-linux-02db0bb33acf8afbdb9fb4fbaa99f7185337098f.tar.gz kernel-qcow2-linux-02db0bb33acf8afbdb9fb4fbaa99f7185337098f.tar.xz kernel-qcow2-linux-02db0bb33acf8afbdb9fb4fbaa99f7185337098f.zip | |
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/staging')
| -rw-r--r-- | drivers/staging/iio/adc/ad7745.c | 4 | ||||
| -rw-r--r-- | drivers/staging/iio/iio.h | 4 | ||||
| -rw-r--r-- | drivers/staging/iio/sysfs.h | 1 |
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 = { * 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 1ad9480fc694..4dc4ff0232a4 100644 --- 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 9b855f3f5320..dd79b5844212 100644 --- 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 |