Skip to content

Commit

Permalink
staging: comedi: comedi_buf: cleanup comedi_buf_read_n_available()
Browse files Browse the repository at this point in the history
For aesthetic reasons, cleanup this function a bit.

Change the (async == NULL) test to simply (!async).

Reword the comment about the need for the smp_rmb()..

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 d21af4c commit 43f9137
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/staging/comedi/comedi_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,17 @@ unsigned int comedi_buf_read_n_available(struct comedi_async *async)
{
unsigned num_bytes;

if (async == NULL)
if (!async)
return 0;

num_bytes = async->munge_count - async->buf_read_count;
/* barrier insures the read of munge_count in this
query occurs before any following reads of the buffer which
might be based on the return value from this query.

/*
* ensure the async buffer 'counts' are read before we
* attempt to read data from the buffer
*/
smp_rmb();

return num_bytes;
}
EXPORT_SYMBOL(comedi_buf_read_n_available);
Expand Down

0 comments on commit 43f9137

Please sign in to comment.