From: Ian Abbott Date: Tue, 6 May 2014 12:12:14 +0000 (+0100) Subject: staging: comedi: pass subdevice to comedi_buf_write_n_available() X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~460 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a1c0e5fe68b437ba43b3125fbe5d8c72dca242a2;p=firefly-linux-kernel-4.4.55.git staging: comedi: pass subdevice to comedi_buf_write_n_available() Local function `comedi_buf_write_n_available()` currently takes a pointer to a `struct comedi_async`. Change it to take a pointer to a `struct comedi_subdevice` and use the `async` member for consistency with the other comedi buffer handling functions. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 5be91cd88cc3..df4a9c4bca35 100644 --- a/drivers/staging/comedi/comedi_buf.c +++ b/drivers/staging/comedi/comedi_buf.c @@ -243,8 +243,9 @@ void comedi_buf_reset(struct comedi_subdevice *s) async->events = 0; } -static unsigned int comedi_buf_write_n_available(struct comedi_async *async) +static unsigned int comedi_buf_write_n_available(struct comedi_subdevice *s) { + struct comedi_async *async = s->async; unsigned int free_end = async->buf_read_count + async->prealloc_bufsz; return free_end - async->buf_write_alloc_count; @@ -255,7 +256,7 @@ static unsigned int __comedi_buf_write_alloc(struct comedi_subdevice *s, int strict) { struct comedi_async *async = s->async; - unsigned int available = comedi_buf_write_n_available(async); + unsigned int available = comedi_buf_write_n_available(s); if (nbytes > available) nbytes = strict ? 0 : available;