Commit 07e6229e authored by Manuel Stahl's avatar Manuel Stahl Committed by Greg Kroah-Hartman

staging: iio: lis3l02dq adjust lis3l02dq_configure_ring

Now fits other driver's structure for easier modification.
Signed-off-by: default avatarManuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ffcab07a
...@@ -479,7 +479,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) ...@@ -479,7 +479,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
{ {
int ret; int ret;
struct iio_sw_ring_helper_state *h = iio_dev_get_devdata(indio_dev); struct iio_sw_ring_helper_state *h = iio_dev_get_devdata(indio_dev);
struct iio_ring_buffer *ring;
INIT_WORK(&h->work_trigger_to_ring, lis3l02dq_trigger_bh_to_ring); INIT_WORK(&h->work_trigger_to_ring, lis3l02dq_trigger_bh_to_ring);
/* Set default scan mode */ /* Set default scan mode */
h->get_ring_element = &lis3l02dq_get_ring_element; h->get_ring_element = &lis3l02dq_get_ring_element;
...@@ -490,17 +490,18 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) ...@@ -490,17 +490,18 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
indio_dev->scan_el_attrs = &lis3l02dq_scan_el_group; indio_dev->scan_el_attrs = &lis3l02dq_scan_el_group;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) if (!ring)
return -ENOMEM; return -ENOMEM;
indio_dev->ring = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
iio_ring_sw_register_funcs(&indio_dev->ring->access); iio_ring_sw_register_funcs(&ring->access);
indio_dev->ring->bpe = 2; ring->bpe = 2;
indio_dev->ring->preenable = &iio_sw_ring_preenable; ring->preenable = &iio_sw_ring_preenable;
indio_dev->ring->postenable = &iio_triggered_ring_postenable; ring->postenable = &iio_triggered_ring_postenable;
indio_dev->ring->predisable = &iio_triggered_ring_predisable; ring->predisable = &iio_triggered_ring_predisable;
indio_dev->ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th); ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th);
if (ret) if (ret)
......
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