Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249794
b: refs/heads/master
c: e058003
h: refs/heads/master
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed May 19, 2011
1 parent 470dc95 commit 9b91cc7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 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: 52615d4783df043605080f7ee65607eb60e3f076
refs/heads/master: e0580032658c3b9c4e1ffca3a60a5c865a44cb36
14 changes: 10 additions & 4 deletions trunk/drivers/staging/iio/ring_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,8 @@ int iio_sw_ring_preenable(struct iio_dev *indio_dev)
}
EXPORT_SYMBOL(iio_sw_ring_preenable);

void iio_sw_trigger_bh_to_ring(struct work_struct *work_s)
void iio_sw_trigger_to_ring(struct iio_sw_ring_helper_state *st)
{
struct iio_sw_ring_helper_state *st
= container_of(work_s, struct iio_sw_ring_helper_state,
work_trigger_to_ring);
struct iio_ring_buffer *ring = st->indio_dev->ring;
int len = 0;
size_t datasize = ring->access.get_bytes_per_datum(ring);
Expand Down Expand Up @@ -488,6 +485,15 @@ void iio_sw_trigger_bh_to_ring(struct work_struct *work_s)

return;
}
EXPORT_SYMBOL(iio_sw_trigger_to_ring);

void iio_sw_trigger_bh_to_ring(struct work_struct *work_s)
{
struct iio_sw_ring_helper_state *st
= container_of(work_s, struct iio_sw_ring_helper_state,
work_trigger_to_ring);
iio_sw_trigger_to_ring(st);
}
EXPORT_SYMBOL(iio_sw_trigger_bh_to_ring);

void iio_sw_poll_func_th(struct iio_dev *indio_dev, s64 time)
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/staging/iio/ring_sw.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ struct iio_sw_ring_helper_state {

void iio_sw_poll_func_th(struct iio_dev *indio_dev, s64 time);
void iio_sw_trigger_bh_to_ring(struct work_struct *work_s);
void iio_sw_trigger_to_ring(struct iio_sw_ring_helper_state *st);

#else /* CONFIG_IIO_RING_BUFFER*/
struct iio_sw_ring_helper_state {
Expand Down

0 comments on commit 9b91cc7

Please sign in to comment.