diff options
| author | Josselin Costanzi <josselin.costanzi@mobile-devices.fr> | 2014-06-27 17:20:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-06-29 14:43:38 +0100 |
| commit | 9dd4694dafbd8b44ac4ca740beede18ca67d725f (patch) | |
| tree | ef696cb9eb65ebd3ebd0942b2ede217eb843e360 | |
| parent | f1b07cdf6ba396d0ddcfd01caf358bdf897090d6 (diff) | |
iio: staging: sca3000: hide stufftoread logiciio-for-3.17b
Change sca3000_ring implementation so that it exports a data_available
function to iio.
Signed-off-by: Josselin Costanzi <josselin.costanzi@mobile-devices.fr>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/industrialio-buffer.c | 5 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/sca3000_ring.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 36b1ae92e239..2952ee038477 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -39,10 +39,7 @@ static bool iio_buffer_is_active(struct iio_buffer *buf) static bool iio_buffer_data_available(struct iio_buffer *buf) { - if (buf->access->data_available) - return buf->access->data_available(buf); - - return buf->stufftoread; + return buf->access->data_available(buf); } /** diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index 198710651e0e..33f0e9235be7 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c @@ -141,6 +141,11 @@ static int sca3000_ring_get_bytes_per_datum(struct iio_buffer *r) return 6; } +static bool sca3000_ring_buf_data_available(struct iio_buffer *r) +{ + return r->stufftoread; +} + static IIO_BUFFER_ENABLE_ATTR; static IIO_BUFFER_LENGTH_ATTR; @@ -274,6 +279,7 @@ static const struct iio_buffer_access_funcs sca3000_ring_access_funcs = { .read_first_n = &sca3000_read_first_n_hw_rb, .get_length = &sca3000_ring_get_length, .get_bytes_per_datum = &sca3000_ring_get_bytes_per_datum, + .data_available = sca3000_ring_buf_data_available, .release = sca3000_ring_release, }; |