diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-09 13:32:18 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 16:53:59 -0800 |
| commit | 8bd650f91be07fb84adc2e47fb1379b7223b95a4 (patch) | |
| tree | 4c3234731e0b1d08a101755e79f0441d0c7e297b | |
| parent | staging: comedi: comedi_buf: don't expose comedi_buf_read_n_allocated() (diff) | |
| download | wireguard-linux-8bd650f91be07fb84adc2e47fb1379b7223b95a4.tar.xz wireguard-linux-8bd650f91be07fb84adc2e47fb1379b7223b95a4.zip | |
staging: comedi: comedi_buf: don't expose comedi_buf_write_n_allocated()
This helper function is only called by the comedi core in comedi_buf.c
and comedi_fops.c. For aesthetic reasons, move it to comedi_buf.c and
remove the inline. Move the prototype from comedidev.h to comedi_internal.h
so it's not exposed outside the comedi core.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/comedi_buf.c | 5 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_internal.h | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 891cf89efa91..c562346e4429 100644 --- a/drivers/staging/comedi/comedi_buf.c +++ b/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/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h index 9e94f2deb3be..5e6f05b30e6c 100644 --- a/drivers/staging/comedi/comedi_internal.h +++ b/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/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 4d5a35ebc311..140678da55d4 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/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); |