Skip to content

Commit

Permalink
staging: comedi: comedi_buf: remove comedi_buf_write_alloc_strict
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent f8f76e9 commit 47181ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 1 addition & 8 deletions drivers/staging/comedi/comedi_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,6 @@ int comedi_buf_get(struct comedi_async *async, short *x);

unsigned int comedi_buf_write_alloc(struct comedi_async *async,
unsigned int nbytes);
unsigned int comedi_buf_write_alloc_strict(struct comedi_async *async,
unsigned int nbytes);
unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes);
unsigned comedi_buf_read_alloc(struct comedi_async *async, unsigned nbytes);
unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes);
Expand Down

0 comments on commit 47181ea

Please sign in to comment.