Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281423
b: refs/heads/master
c: 869871b
h: refs/heads/master
i:
  281421: ac1329d
  281419: 9d1290f
  281415: 39f27c0
  281407: 08f1203
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Dec 22, 2011
1 parent 90c80ea commit 62da7cf
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 35 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 307276cb8366d9c163160fe2775f5bfe7b9c1495
refs/heads/master: 869871b58c7f7c26ccf7a89cbe599e9b963b8e69
2 changes: 0 additions & 2 deletions trunk/drivers/staging/iio/Documentation/ring.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ rip_first_n
The primary buffer reading function. Note that it may well not return
as much data as requested.

mark_param_changed
Used to indicate that something has changed. Used in conjunction with
request_update
If parameters have changed that require reinitialization or configuration of
the buffer this will trigger it.
Expand Down
4 changes: 0 additions & 4 deletions trunk/drivers/staging/iio/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ struct iio_buffer;
* @unmark_in_use: reduce reference count when no longer using buffer
* @store_to: actually store stuff to the buffer
* @read_first_n: try to get a specified number of bytes (must exist)
* @mark_param_change: notify buffer that some relevant parameter has changed
* Often this means the underlying storage may need to
* change.
* @request_update: if a parameter change has been marked, update underlying
* storage.
* @get_bytes_per_datum:get current bytes per datum
Expand All @@ -49,7 +46,6 @@ struct iio_buffer_access_funcs {
size_t n,
char __user *buf);

int (*mark_param_change)(struct iio_buffer *buffer);
int (*request_update)(struct iio_buffer *buffer);

int (*get_bytes_per_datum)(struct iio_buffer *buffer);
Expand Down
5 changes: 1 addition & 4 deletions trunk/drivers/staging/iio/industrialio-buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,8 @@ ssize_t iio_buffer_write_length(struct device *dev,
if (iio_buffer_enabled(indio_dev)) {
ret = -EBUSY;
} else {
if (buffer->access->set_length) {
if (buffer->access->set_length)
buffer->access->set_length(buffer, val);
if (buffer->access->mark_param_change)
buffer->access->mark_param_change(buffer);
}
ret = 0;
}
mutex_unlock(&indio_dev->mlock);
Expand Down
21 changes: 9 additions & 12 deletions trunk/drivers/staging/iio/kfifo_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,29 +109,27 @@ static int iio_get_bytes_per_datum_kfifo(struct iio_buffer *r)
return r->bytes_per_datum;
}

static int iio_set_bytes_per_datum_kfifo(struct iio_buffer *r, size_t bpd)
static int iio_mark_update_needed_kfifo(struct iio_buffer *r)
{
if (r->bytes_per_datum != bpd) {
r->bytes_per_datum = bpd;
if (r->access->mark_param_change)
r->access->mark_param_change(r);
}
struct iio_kfifo *kf = iio_to_kfifo(r);
kf->update_needed = true;
return 0;
}

static int iio_mark_update_needed_kfifo(struct iio_buffer *r)
static int iio_set_bytes_per_datum_kfifo(struct iio_buffer *r, size_t bpd)
{
struct iio_kfifo *kf = iio_to_kfifo(r);
kf->update_needed = true;
if (r->bytes_per_datum != bpd) {
r->bytes_per_datum = bpd;
iio_mark_update_needed_kfifo(r);
}
return 0;
}

static int iio_set_length_kfifo(struct iio_buffer *r, int length)
{
if (r->length != length) {
r->length = length;
if (r->access->mark_param_change)
r->access->mark_param_change(r);
iio_mark_update_needed_kfifo(r);
}
return 0;
}
Expand Down Expand Up @@ -174,7 +172,6 @@ const struct iio_buffer_access_funcs kfifo_access_funcs = {
.unmark_in_use = &iio_unmark_kfifo_in_use,
.store_to = &iio_store_to_kfifo,
.read_first_n = &iio_read_first_n_kfifo,
.mark_param_change = &iio_mark_update_needed_kfifo,
.request_update = &iio_request_update_kfifo,
.get_bytes_per_datum = &iio_get_bytes_per_datum_kfifo,
.set_bytes_per_datum = &iio_set_bytes_per_datum_kfifo,
Expand Down
21 changes: 9 additions & 12 deletions trunk/drivers/staging/iio/ring_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,18 @@ static int iio_get_bytes_per_datum_sw_rb(struct iio_buffer *r)
return ring->buf.bytes_per_datum;
}

static int iio_mark_update_needed_sw_rb(struct iio_buffer *r)
{
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
ring->update_needed = true;
return 0;
}

static int iio_set_bytes_per_datum_sw_rb(struct iio_buffer *r, size_t bpd)
{
if (r->bytes_per_datum != bpd) {
r->bytes_per_datum = bpd;
if (r->access->mark_param_change)
r->access->mark_param_change(r);
iio_mark_update_needed_sw_rb(r);
}
return 0;
}
Expand All @@ -335,19 +341,11 @@ static int iio_set_length_sw_rb(struct iio_buffer *r, int length)
{
if (r->length != length) {
r->length = length;
if (r->access->mark_param_change)
r->access->mark_param_change(r);
iio_mark_update_needed_sw_rb(r);
}
return 0;
}

static int iio_mark_update_needed_sw_rb(struct iio_buffer *r)
{
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
ring->update_needed = true;
return 0;
}

static IIO_BUFFER_ENABLE_ATTR;
static IIO_BUFFER_LENGTH_ATTR;

Expand Down Expand Up @@ -392,7 +390,6 @@ const struct iio_buffer_access_funcs ring_sw_access_funcs = {
.unmark_in_use = &iio_unmark_sw_rb_in_use,
.store_to = &iio_store_to_sw_rb,
.read_first_n = &iio_read_first_n_sw_rb,
.mark_param_change = &iio_mark_update_needed_sw_rb,
.request_update = &iio_request_update_sw_rb,
.get_bytes_per_datum = &iio_get_bytes_per_datum_sw_rb,
.set_bytes_per_datum = &iio_set_bytes_per_datum_sw_rb,
Expand Down

0 comments on commit 62da7cf

Please sign in to comment.