diff options
| author | Jonathan Cameron | 2010-07-11 17:39:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-07-22 20:38:28 +0200 |
| commit | c3db00cc80cf01f9a2033c3f3eb03345d0024761 (patch) | |
| tree | cead6de24daaea7fe892461312bfe99040d77c75 /drivers/staging/iio/accel/lis3l02dq_ring.c | |
| parent | staging: iio: Add and convert drivers to use iio_alloc_pollfunc (diff) | |
| download | kernel-qcow2-linux-c3db00cc80cf01f9a2033c3f3eb03345d0024761.tar.gz kernel-qcow2-linux-c3db00cc80cf01f9a2033c3f3eb03345d0024761.tar.xz kernel-qcow2-linux-c3db00cc80cf01f9a2033c3f3eb03345d0024761.zip | |
staging: iio: Add iio_triggered_ring postenable and predisable + use in drivers
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/lis3l02dq_ring.c')
| -rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_ring.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index 38c7340d48cf..bc0de784104b 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -339,23 +339,6 @@ static int lis3l02dq_data_rdy_ring_preenable(struct iio_dev *indio_dev) return 0; } -static int lis3l02dq_data_rdy_ring_postenable(struct iio_dev *indio_dev) -{ - return indio_dev->trig - ? iio_trigger_attach_poll_func(indio_dev->trig, - indio_dev->pollfunc) - : 0; -} - -static int lis3l02dq_data_rdy_ring_predisable(struct iio_dev *indio_dev) -{ - return indio_dev->trig - ? iio_trigger_dettach_poll_func(indio_dev->trig, - indio_dev->pollfunc) - : 0; -} - - /* Caller responsible for locking as necessary. */ static int __lis3l02dq_write_data_ready_config(struct device *dev, @@ -562,8 +545,8 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) /* Effectively select the ring buffer implementation */ iio_ring_sw_register_funcs(&ring->access); ring->preenable = &lis3l02dq_data_rdy_ring_preenable; - ring->postenable = &lis3l02dq_data_rdy_ring_postenable; - ring->predisable = &lis3l02dq_data_rdy_ring_predisable; + ring->postenable = &iio_triggered_ring_postenable; + ring->predisable = &iio_triggered_ring_predisable; ring->owner = THIS_MODULE; ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th); |