From: H Hartley Sweeten Date: Wed, 9 Jan 2013 20:28:20 +0000 (-0700) Subject: staging: comedi: comedi_buf: remove comedi_buf_write_alloc_strict X-Git-Tag: v3.9-rc1~127^2~437 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=47181eab71a81a919bf74eee570d6db59c6cf298;p=~emulex%2Finfiniband.git 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 Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 2f38a87fbcf..1b269a7a07a 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; diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index bf0fd8df91d..cbfb6147cce 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -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);