diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 13:41:22 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 23:14:49 (GMT) |
| commit | d1dbf01128dd1d675bcbe85da49af6c9a8c56cff (patch) | |
| tree | fc7e58a0c8105576425f6ff119425931d120a659 /drivers/staging/iio/accel/lis3l02dq_core.c | |
| parent | 8384d9573e937949eba96eaa1323253c2687aa5c (diff) | |
| download | linux-fsl-qoriq-d1dbf01128dd1d675bcbe85da49af6c9a8c56cff.tar.xz | |
staging:iio:accel:lis3l02dq move to threaded trigger handling.
V2: Cleaned up handling of name string.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/lis3l02dq_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index 6c5f8a6..b1fb049 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c @@ -15,15 +15,12 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/gpio.h> -#include <linux/workqueue.h> #include <linux/mutex.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/spi/spi.h> #include <linux/slab.h> - #include <linux/sysfs.h> -#include <linux/list.h> #include "../iio.h" #include "../sysfs.h" @@ -724,7 +721,6 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi) } if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) { - st->inter = 0; ret = lis3l02dq_probe_trigger(st->help.indio_dev); if (ret) goto error_uninitialize_ring; @@ -800,8 +796,6 @@ static int lis3l02dq_remove(struct spi_device *spi) if (ret) goto err_ret; - flush_scheduled_work(); - lis3l02dq_remove_trigger(indio_dev); iio_ring_buffer_unregister(indio_dev->ring); lis3l02dq_unconfigure_ring(indio_dev); |