aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/industrialio-buffer.c11
-rw-r--r--drivers/iio/kfifo_buf.c6
2 files changed, 3 insertions, 14 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 4ca4c0a09923..2bd8d399f2ec 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -390,11 +390,7 @@ static ssize_t iio_buffer_read_length(struct device *dev,
390 struct iio_dev *indio_dev = dev_to_iio_dev(dev); 390 struct iio_dev *indio_dev = dev_to_iio_dev(dev);
391 struct iio_buffer *buffer = indio_dev->buffer; 391 struct iio_buffer *buffer = indio_dev->buffer;
392 392
393 if (buffer->access->get_length) 393 return sprintf(buf, "%d\n", buffer->length);
394 return sprintf(buf, "%d\n",
395 buffer->access->get_length(buffer));
396
397 return 0;
398} 394}
399 395
400static ssize_t iio_buffer_write_length(struct device *dev, 396static ssize_t iio_buffer_write_length(struct device *dev,
@@ -410,9 +406,8 @@ static ssize_t iio_buffer_write_length(struct device *dev,
410 if (ret) 406 if (ret)
411 return ret; 407 return ret;
412 408
413 if (buffer->access->get_length) 409 if (val == buffer->length)
414 if (val == buffer->access->get_length(buffer)) 410 return len;
415 return len;
416 411
417 mutex_lock(&indio_dev->mlock); 412 mutex_lock(&indio_dev->mlock);
418 if (iio_buffer_is_active(indio_dev->buffer)) { 413 if (iio_buffer_is_active(indio_dev->buffer)) {
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index 3b0a3bc4f0ad..b20a9cfbc8ed 100644
--- a/drivers/iio/kfifo_buf.c
+++ b/drivers/iio/kfifo_buf.c
@@ -47,11 +47,6 @@ static int iio_request_update_kfifo(struct iio_buffer *r)
47 return ret; 47 return ret;
48} 48}
49 49
50static int iio_get_length_kfifo(struct iio_buffer *r)
51{
52 return r->length;
53}
54
55static int iio_mark_update_needed_kfifo(struct iio_buffer *r) 50static int iio_mark_update_needed_kfifo(struct iio_buffer *r)
56{ 51{
57 struct iio_kfifo *kf = iio_to_kfifo(r); 52 struct iio_kfifo *kf = iio_to_kfifo(r);
@@ -141,7 +136,6 @@ static const struct iio_buffer_access_funcs kfifo_access_funcs = {
141 .data_available = iio_kfifo_buf_data_available, 136 .data_available = iio_kfifo_buf_data_available,
142 .request_update = &iio_request_update_kfifo, 137 .request_update = &iio_request_update_kfifo,
143 .set_bytes_per_datum = &iio_set_bytes_per_datum_kfifo, 138 .set_bytes_per_datum = &iio_set_bytes_per_datum_kfifo,
144 .get_length = &iio_get_length_kfifo,
145 .set_length = &iio_set_length_kfifo, 139 .set_length = &iio_set_length_kfifo,
146 .release = &iio_kfifo_buffer_release, 140 .release = &iio_kfifo_buffer_release,
147}; 141};