diff options
author | Jonathan Cameron | 2011-04-15 19:55:55 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2011-04-26 02:23:09 +0200 |
commit | b428173316dcb4a518ee22c642671ae8a4bcec48 (patch) | |
tree | d66dfcf2c5b6469d72b52fe21a9fcf2553b73ada /drivers/staging/iio/ring_sw.c | |
parent | staging:iio: iio_trigger_unregister - remove rather strange search for what w... (diff) | |
download | kernel-qcow2-linux-b428173316dcb4a518ee22c642671ae8a4bcec48.tar.gz kernel-qcow2-linux-b428173316dcb4a518ee22c642671ae8a4bcec48.tar.xz kernel-qcow2-linux-b428173316dcb4a518ee22c642671ae8a4bcec48.zip |
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/ring_sw.c')
-rw-r--r-- | drivers/staging/iio/ring_sw.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c index b71ce3900649..ea0015eee13e 100644 --- a/drivers/staging/iio/ring_sw.c +++ b/drivers/staging/iio/ring_sw.c @@ -152,8 +152,8 @@ error_ret: return ret; } -int iio_rip_sw_rb(struct iio_ring_buffer *r, - size_t count, char __user *buf, int *dead_offset) +int iio_read_first_n_sw_rb(struct iio_ring_buffer *r, + size_t n, char __user *buf, int *dead_offset) { struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); @@ -166,15 +166,16 @@ int iio_rip_sw_rb(struct iio_ring_buffer *r, * read something that is not a whole number of bpds. * Return an error. */ - if (count % ring->buf.bytes_per_datum) { + if (n % ring->buf.bytes_per_datum) { ret = -EINVAL; printk(KERN_INFO "Ring buffer read request not whole number of" "samples: Request bytes %zd, Current bytes per datum %d\n", - count, ring->buf.bytes_per_datum); + n, ring->buf.bytes_per_datum); goto error_ret; } /* Limit size to whole of ring buffer */ - bytes_to_rip = min((size_t)(ring->buf.bytes_per_datum*ring->buf.length), count); + bytes_to_rip = min((size_t)(ring->buf.bytes_per_datum*ring->buf.length), + n); data = kmalloc(bytes_to_rip, GFP_KERNEL); if (data == NULL) { @@ -278,7 +279,7 @@ error_ret: return ret; } -EXPORT_SYMBOL(iio_rip_sw_rb); +EXPORT_SYMBOL(iio_read_first_n_sw_rb); int iio_store_to_sw_rb(struct iio_ring_buffer *r, u8 *data, s64 timestamp) { |