diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-09 13:28:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 16:53:58 -0800 |
| commit | 47181eab71a81a919bf74eee570d6db59c6cf298 (patch) | |
| tree | 4363864cfb4d4744b930fb86fcb092068651549f /drivers/staging/comedi/comedi_buf.c | |
| parent | f8f76e909b8cc6696071e69cf4be07714c95bcb4 (diff) | |
| download | op-kernel-dev-47181eab71a81a919bf74eee570d6db59c6cf298.zip op-kernel-dev-47181eab71a81a919bf74eee570d6db59c6cf298.tar.gz | |
staging: comedi: comedi_buf: remove comedi_buf_write_alloc_strict
This function is only called by comedi_buf_put(). Remove it and just
call __comedi_buf_write_alloc() directly with the strict flag set.
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>
Diffstat (limited to 'drivers/staging/comedi/comedi_buf.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_buf.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 2f38a87..1b269a7 100644 --- a/drivers/staging/comedi/comedi_buf.c +++ b/drivers/staging/comedi/comedi_buf.c @@ -194,13 +194,6 @@ unsigned int comedi_buf_write_alloc(struct comedi_async *async, } EXPORT_SYMBOL(comedi_buf_write_alloc); -/* allocates nothing unless it can completely fulfill the request */ -unsigned int comedi_buf_write_alloc_strict(struct comedi_async *async, - unsigned int nbytes) -{ - return __comedi_buf_write_alloc(async, nbytes, 1); -} - /* munging is applied to data by core as it passes between user * and kernel space */ static unsigned int comedi_buf_munge(struct comedi_async *async, @@ -319,7 +312,7 @@ EXPORT_SYMBOL(comedi_buf_read_free); int comedi_buf_put(struct comedi_async *async, short x) { - unsigned int n = comedi_buf_write_alloc_strict(async, sizeof(short)); + unsigned int n = __comedi_buf_write_alloc(async, sizeof(short), 1); if (n < sizeof(short)) { async->events |= COMEDI_CB_ERROR; |
