From c7f729b9809d5938e199c0f028516523240531b4 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 9 Jan 2013 13:32:18 -0700 Subject: [PATCH] --- yaml --- r: 354032 b: refs/heads/master c: 8bd650f91be07fb84adc2e47fb1379b7223b95a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_buf.c | 5 +++++ trunk/drivers/staging/comedi/comedi_internal.h | 1 + trunk/drivers/staging/comedi/comedidev.h | 4 ---- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c68c32347dc7..10d6d46b4b7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b2b64b7510292f4b1e6363edb6f53c39828672e +refs/heads/master: 8bd650f91be07fb84adc2e47fb1379b7223b95a4 diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c index 891cf89efa91..c562346e4429 100644 --- a/trunk/drivers/staging/comedi/comedi_buf.c +++ b/trunk/drivers/staging/comedi/comedi_buf.c @@ -249,6 +249,11 @@ static unsigned int comedi_buf_munge(struct comedi_async *async, return count; } +unsigned int comedi_buf_write_n_allocated(struct comedi_async *async) +{ + return async->buf_write_alloc_count - async->buf_write_count; +} + /* transfers a chunk from writer to filled buffer space */ unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes) { diff --git a/trunk/drivers/staging/comedi/comedi_internal.h b/trunk/drivers/staging/comedi/comedi_internal.h index 9e94f2deb3be..5e6f05b30e6c 100644 --- a/trunk/drivers/staging/comedi/comedi_internal.h +++ b/trunk/drivers/staging/comedi/comedi_internal.h @@ -17,6 +17,7 @@ int comedi_find_board_minor(struct device *hardware_device); int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, unsigned long new_size); void comedi_buf_reset(struct comedi_async *async); +unsigned int comedi_buf_write_n_allocated(struct comedi_async *async); extern unsigned int comedi_default_buf_size_kb; extern unsigned int comedi_default_buf_maxsize_kb; diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 4d5a35ebc311..140678da55d4 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -448,10 +448,6 @@ void comedi_buf_memcpy_to(struct comedi_async *async, unsigned int offset, const void *source, unsigned int num_bytes); void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset, void *destination, unsigned int num_bytes); -static inline unsigned comedi_buf_write_n_allocated(struct comedi_async *async) -{ - return async->buf_write_alloc_count - async->buf_write_count; -} int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s);