diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-04-15 17:55:55 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-26 00:23:09 (GMT) |
commit | b428173316dcb4a518ee22c642671ae8a4bcec48 (patch) | |
tree | d66dfcf2c5b6469d72b52fe21a9fcf2553b73ada /drivers/staging/iio/accel/sca3000_ring.c | |
parent | 582e548908729dd2f3e183fda5a8b7c2e2ca0b0e (diff) | |
download | linux-b428173316dcb4a518ee22c642671ae8a4bcec48.tar.xz |
staging:iio: replace rip_lots naming with read_first_n
Change suggested by Arnd Bergmann, Related patch to remove
pointless (now) dead_offset parameter will have await
proper fix for the sca3000 driver. That depends on
some intermediate patches so may be a little while.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/sca3000_ring.c')
-rw-r--r-- | drivers/staging/iio/accel/sca3000_ring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index a730a76..b505e70 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c @@ -35,7 +35,7 @@ */ /** - * sca3000_rip_hw_rb() - main ring access function, pulls data from ring + * sca3000_read_first_n_hw_rb() - main ring access, pulls data from ring * @r: the ring * @count: number of samples to try and pull * @data: output the actual samples pulled from the hw ring @@ -46,8 +46,8 @@ * can only be inferred approximately from ring buffer events such as 50% full * and knowledge of when buffer was last emptied. This is left to userspace. **/ -static int sca3000_rip_hw_rb(struct iio_ring_buffer *r, - size_t count, u8 **data, int *dead_offset) +static int sca3000_read_first_n_hw_rb(struct iio_ring_buffer *r, + size_t count, u8 **data, int *dead_offset) { struct iio_hw_ring_buffer *hw_ring = iio_to_hw_ring_buf(r); struct iio_dev *indio_dev = hw_ring->private; @@ -283,7 +283,7 @@ int sca3000_configure_ring(struct iio_dev *indio_dev) indio_dev->modes |= INDIO_RING_HARDWARE_BUFFER; indio_dev->ring->scan_el_attrs = &sca3000_scan_el_group; - indio_dev->ring->access.rip_lots = &sca3000_rip_hw_rb; + indio_dev->ring->access.read_first_n = &sca3000_read_first_n_hw_rb; indio_dev->ring->access.get_length = &sca3000_ring_get_length; indio_dev->ring->access.get_bytes_per_datum = &sca3000_ring_get_bytes_per_datum; |