Title: [9317] trunk/drivers/staging/iio/accel/lis3l02dq_ring.c: merge from upstream: staging: iio: lis3l02dq adjust lis3l02dq_configure_ring
- Revision
- 9317
- Author
- vapier
- Date
- 2010-10-24 16:36:34 -0400 (Sun, 24 Oct 2010)
Log Message
merge from upstream: staging: iio: lis3l02dq adjust lis3l02dq_configure_ring
From: Manuel Stahl <[email protected]>
Now fits other driver's structure for easier modification.
Signed-off-by: Manuel Stahl <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/accel/lis3l02dq_ring.c (9316 => 9317)
--- trunk/drivers/staging/iio/accel/lis3l02dq_ring.c 2010-10-24 20:36:29 UTC (rev 9316)
+++ trunk/drivers/staging/iio/accel/lis3l02dq_ring.c 2010-10-24 20:36:34 UTC (rev 9317)
@@ -479,7 +479,7 @@
{
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 @@
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)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
