diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2011-05-18 14:42:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:14:57 -0700 |
| commit | e61181d0a3e6788d57de9c1ae305d1c6f5fabade (patch) | |
| tree | 5a5868902e1658bb8dc2b5abfd0c8f19f3edcc0a /drivers/staging/iio/adc/ad7606_ring.c | |
| parent | 1caf7cb461351b33d6229692a17afcad238e5b7a (diff) | |
staging:iio:adc:ad7606: Use private data space from iio_allocate_device
Trivial backport done by Jonathan Cameron
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/ad7606_ring.c')
| -rw-r--r-- | drivers/staging/iio/adc/ad7606_ring.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c index 15531b62e2fd..351d58eb9082 100644 --- a/drivers/staging/iio/adc/ad7606_ring.c +++ b/drivers/staging/iio/adc/ad7606_ring.c @@ -23,11 +23,12 @@ int ad7606_scan_from_ring(struct ad7606_state *st, unsigned ch) { - struct iio_ring_buffer *ring = st->indio_dev->ring; + struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; int ret; u16 *ring_data; - ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), GFP_KERNEL); + ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), + GFP_KERNEL); if (ring_data == NULL) { ret = -ENOMEM; goto error_ret; @@ -103,7 +104,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s) { struct ad7606_state *st = container_of(work_s, struct ad7606_state, poll_work); - struct iio_dev *indio_dev = st->indio_dev; + struct iio_dev *indio_dev = iio_priv_to_dev(st); struct iio_sw_ring_buffer *sw_ring = iio_to_sw_ring(indio_dev->ring); struct iio_ring_buffer *ring = indio_dev->ring; s64 time_ns; |