staging:iio: Remove used iio_work_cont definition and all references

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

diff --git a/drivers/staging/iio/accel/adis16209.h b/drivers/staging/iio/accel/adis16209.h
index 877fd2a4838060cfb261f2f029cf27eac2182539..c1d7b471e44a3cc881a1e2c022483947f3887618 100644 (file)
--- a/drivers/staging/iio/accel/adis16209.h
+++ b/drivers/staging/iio/accel/adis16209.h
@@ -105,8 +105,6 @@
  * struct adis16209_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure
  * @trig:              data ready trigger registered with iio
@@ -117,7 +115,6 @@
 struct adis16209_state {
        struct spi_device               *us;
        struct work_struct              work_trigger_to_ring;
-       struct iio_work_cont            work_cont_thresh;
        s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;

diff --git a/drivers/staging/iio/accel/adis16220.h b/drivers/staging/iio/accel/adis16220.h
index 2abf4850b3735742c7a3b993597c0b9791721b85..7013314a9d7775c45a45c371e31c59b8683aab10 100644 (file)
--- a/drivers/staging/iio/accel/adis16220.h
+++ b/drivers/staging/iio/accel/adis16220.h
@@ -127,7 +127,6 @@
  * struct adis16220_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure

diff --git a/drivers/staging/iio/accel/adis16240.h b/drivers/staging/iio/accel/adis16240.h
index dcff43c75235a10343b10206162b095272791a6b..86e0f3ddb60a353fd0b03b29266a5fbd22d80507 100644 (file)
--- a/drivers/staging/iio/accel/adis16240.h
+++ b/drivers/staging/iio/accel/adis16240.h
@@ -127,7 +127,6 @@
  * struct adis16240_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure
@@ -139,7 +138,6 @@
 struct adis16240_state {
        struct spi_device               *us;
        struct work_struct              work_trigger_to_ring;
-       struct iio_work_cont            work_cont_thresh;
        s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;

diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h
index f19efb4c91ceb031a5c20b7c9671ea76742efc40..53f5fbd762f26954ca2b9d689952e01eb61e7a3e 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
@@ -85,7 +85,6 @@
  * struct adis16260_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure
@@ -97,7 +96,6 @@
 struct adis16260_state {
        struct spi_device               *us;
        struct work_struct              work_trigger_to_ring;
-       struct iio_work_cont            work_cont_thresh;
        s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;

diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index fcee47cbe894e34d658cbdb7ad26339d4013e6f2..6b9c7526a2ad614abea318bca0b28c457a08c8be 100644 (file)
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -283,49 +283,6 @@ int iio_push_event(struct iio_dev *dev_info,
                  int ev_code,
                  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
  * @ev_int:            the event interface to which we are pushing the event

diff --git a/drivers/staging/iio/imu/adis16300.h b/drivers/staging/iio/imu/adis16300.h
index b050067d502b444a66161006a3a4f4eab0c0a022..3f59d7e0ce6db095ef25a56a7847b119db54dec7 100644 (file)
--- a/drivers/staging/iio/imu/adis16300.h
+++ b/drivers/staging/iio/imu/adis16300.h
@@ -94,7 +94,6 @@
  * struct adis16300_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure
@@ -106,7 +105,6 @@
 struct adis16300_state {
        struct spi_device               *us;
        struct work_struct              work_trigger_to_ring;
-       struct iio_work_cont            work_cont_thresh;
        s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;

diff --git a/drivers/staging/iio/imu/adis16350.h b/drivers/staging/iio/imu/adis16350.h
index 334b18ace38e1632f2da99dca72bb81e7e964cb3..b4533a0e0ef3be969d9cc08d3fc3541befb500c6 100644 (file)
--- a/drivers/staging/iio/imu/adis16350.h
+++ b/drivers/staging/iio/imu/adis16350.h
@@ -100,7 +100,6 @@
  * struct adis16350_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure
@@ -112,7 +111,6 @@
 struct adis16350_state {
        struct spi_device               *us;
        struct work_struct              work_trigger_to_ring;
-       struct iio_work_cont            work_cont_data_rdy;
        s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;

diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h
index 04bae36ed5ab07301f821d0efe460945c5b808e7..f74faee1d292c5303729f51a8295af5f50d94e15 100644 (file)
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -126,7 +126,6 @@
  * struct adis16400_state - device instance specific data
  * @us:                        actual spi_device
  * @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
  * @indio_dev:         industrial I/O device structure
@@ -138,7 +137,6 @@
 struct adis16400_state {
        struct spi_device               *us;
        struct work_struct              work_trigger_to_ring;
-       struct iio_work_cont            work_cont_thresh;
        s64                             last_timestamp;
        struct iio_dev                  *indio_dev;
        struct iio_trigger              *trig;

diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index a668a90beb4fc6ac057063f1ace37975a5f97f54..160585fab319ec74eaf5f9ed4e72e09fa8bc66a7 100644 (file)
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -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 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,
                                st->indio_dev,
                                0,