Commit 1980e4ac authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio: Remove used iio_work_cont definition and all references

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44b759b7
...@@ -105,8 +105,6 @@ ...@@ -105,8 +105,6 @@
* struct adis16209_state - device instance specific data * struct adis16209_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
* @trig: data ready trigger registered with iio * @trig: data ready trigger registered with iio
...@@ -117,7 +115,6 @@ ...@@ -117,7 +115,6 @@
struct adis16209_state { struct adis16209_state {
struct spi_device *us; struct spi_device *us;
struct work_struct work_trigger_to_ring; struct work_struct work_trigger_to_ring;
struct iio_work_cont work_cont_thresh;
s64 last_timestamp; s64 last_timestamp;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct iio_trigger *trig; struct iio_trigger *trig;
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
* struct adis16220_state - device instance specific data * struct adis16220_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered * @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
* struct adis16240_state - device instance specific data * struct adis16240_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered * @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
...@@ -139,7 +138,6 @@ ...@@ -139,7 +138,6 @@
struct adis16240_state { struct adis16240_state {
struct spi_device *us; struct spi_device *us;
struct work_struct work_trigger_to_ring; struct work_struct work_trigger_to_ring;
struct iio_work_cont work_cont_thresh;
s64 last_timestamp; s64 last_timestamp;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct iio_trigger *trig; struct iio_trigger *trig;
......
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
* struct adis16260_state - device instance specific data * struct adis16260_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered * @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
...@@ -97,7 +96,6 @@ ...@@ -97,7 +96,6 @@
struct adis16260_state { struct adis16260_state {
struct spi_device *us; struct spi_device *us;
struct work_struct work_trigger_to_ring; struct work_struct work_trigger_to_ring;
struct iio_work_cont work_cont_thresh;
s64 last_timestamp; s64 last_timestamp;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct iio_trigger *trig; struct iio_trigger *trig;
......
...@@ -283,49 +283,6 @@ int iio_push_event(struct iio_dev *dev_info, ...@@ -283,49 +283,6 @@ int iio_push_event(struct iio_dev *dev_info,
int ev_code, int ev_code,
s64 timestamp); s64 timestamp);
/**
* struct iio_work_cont - container for when singleton handler case matters
* @ws: [DEVICE] work_struct when not only possible event
* @ws_nocheck: [DEVICE] work_struct when only possible event
* @address: [DEVICE] associated register address
* @mask: [DEVICE] associated mask for identifying event source
* @st: [DEVICE] device specific state information
**/
struct iio_work_cont {
struct work_struct ws;
struct work_struct ws_nocheck;
int address;
int mask;
void *st;
};
#define to_iio_work_cont_check(_ws) \
container_of(_ws, struct iio_work_cont, ws)
#define to_iio_work_cont_no_check(_ws) \
container_of(_ws, struct iio_work_cont, ws_nocheck)
/**
* iio_init_work_cont() - intiialize the elements of a work container
* @cont: the work container
* @_checkfunc: function called when there are multiple possible int sources
* @_nocheckfunc: function for when there is only one int source
* @_add: driver dependent, typically a register address
* @_mask: driver dependent, typically a bit mask for a register
* @_st: driver dependent, typically pointer to a device state structure
**/
static inline void
iio_init_work_cont(struct iio_work_cont *cont,
void (*_checkfunc)(struct work_struct *),
void (*_nocheckfunc)(struct work_struct *),
int _add, int _mask, void *_st)
{
INIT_WORK(&(cont)->ws, _checkfunc);
INIT_WORK(&(cont)->ws_nocheck, _nocheckfunc);
cont->address = _add;
cont->mask = _mask;
cont->st = _st;
}
/** /**
* __iio_push_event() - tries to add an event to the list associated with a chrdev * __iio_push_event() - tries to add an event to the list associated with a chrdev
* @ev_int: the event interface to which we are pushing the event * @ev_int: the event interface to which we are pushing the event
......
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
* struct adis16300_state - device instance specific data * struct adis16300_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered * @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
...@@ -106,7 +105,6 @@ ...@@ -106,7 +105,6 @@
struct adis16300_state { struct adis16300_state {
struct spi_device *us; struct spi_device *us;
struct work_struct work_trigger_to_ring; struct work_struct work_trigger_to_ring;
struct iio_work_cont work_cont_thresh;
s64 last_timestamp; s64 last_timestamp;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct iio_trigger *trig; struct iio_trigger *trig;
......
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
* struct adis16350_state - device instance specific data * struct adis16350_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered * @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
...@@ -112,7 +111,6 @@ ...@@ -112,7 +111,6 @@
struct adis16350_state { struct adis16350_state {
struct spi_device *us; struct spi_device *us;
struct work_struct work_trigger_to_ring; struct work_struct work_trigger_to_ring;
struct iio_work_cont work_cont_data_rdy;
s64 last_timestamp; s64 last_timestamp;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct iio_trigger *trig; struct iio_trigger *trig;
......
...@@ -126,7 +126,6 @@ ...@@ -126,7 +126,6 @@
* struct adis16400_state - device instance specific data * struct adis16400_state - device instance specific data
* @us: actual spi_device * @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling * @work_trigger_to_ring: bh for triggered event handling
* @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered * @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler * @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
...@@ -138,7 +137,6 @@ ...@@ -138,7 +137,6 @@
struct adis16400_state { struct adis16400_state {
struct spi_device *us; struct spi_device *us;
struct work_struct work_trigger_to_ring; struct work_struct work_trigger_to_ring;
struct iio_work_cont work_cont_thresh;
s64 last_timestamp; s64 last_timestamp;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct iio_trigger *trig; struct iio_trigger *trig;
......
...@@ -648,14 +648,6 @@ static int __devinit adis16400_probe(struct spi_device *spi) ...@@ -648,14 +648,6 @@ static int __devinit adis16400_probe(struct spi_device *spi)
} }
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) { if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
#if 0 /* fixme: here we should support */
iio_init_work_cont(&st->work_cont_thresh,
NULL,
adis16400_thresh_handler_bh_no_check,
0,
0,
st);
#endif
ret = iio_register_interrupt_line(spi->irq, ret = iio_register_interrupt_line(spi->irq,
st->indio_dev, st->indio_dev,
0, 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment