staging: iio: lis3l02dq adjust lis3l02dq_configure_ring
authorManuel Stahl <manuel.stahl@iis.fraunhofer.de>
Tue, 31 Aug 2010 09:32:51 +0000 (11:32 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Aug 2010 18:42:01 +0000 (11:42 -0700)
Now fits other driver's structure for easier modification.

Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/accel/lis3l02dq_ring.c

index 4c1b36a76c45590ad2afb9a72545004f20ca308d..9ad04f0bb7099ac6d5cb08d600708d71e126158e 100644 (file)
@@ -479,7 +479,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
 {
        int ret;
        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);
        /* Set default scan mode */
        h->get_ring_element = &lis3l02dq_get_ring_element;
@@ -490,17 +490,18 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
 
        indio_dev->scan_el_attrs = &lis3l02dq_scan_el_group;
 
-       indio_dev->ring = iio_sw_rb_allocate(indio_dev);
-       if (!indio_dev->ring)
+       ring = iio_sw_rb_allocate(indio_dev);
+       if (!ring)
                return -ENOMEM;
 
+       indio_dev->ring = ring;
        /* Effectively select the ring buffer implementation */
-       iio_ring_sw_register_funcs(&indio_dev->ring->access);
-       indio_dev->ring->bpe = 2;
-       indio_dev->ring->preenable = &iio_sw_ring_preenable;
-       indio_dev->ring->postenable = &iio_triggered_ring_postenable;
-       indio_dev->ring->predisable = &iio_triggered_ring_predisable;
-       indio_dev->ring->owner = THIS_MODULE;
+       iio_ring_sw_register_funcs(&ring->access);
+       ring->bpe = 2;
+       ring->preenable = &iio_sw_ring_preenable;
+       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);
        if (ret)