diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-03-07 17:31:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 13:55:53 -0700 |
| commit | 68ef50f6cb39b78e0e3e5007d16d644c2f18acab (patch) | |
| tree | 7a130a566366519864ff2208686852647cdb6cc8 | |
| parent | a3065bc9b420dacd54d333a35701adea104842e8 (diff) | |
staging: comedi: comedi_fc: tidy up cfc_bytes_per_scan()
This function returns the total number of bytes for a full scan of
an async command chanlist. The returned value is an unsigned int.
Change all the local variables to unsigned int and use a local
variable for the s->async->cmd.chanlist_len.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/comedi_fc.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_fc.h b/drivers/staging/comedi/drivers/comedi_fc.h index 042bf87918c6..b8d125e81a0f 100644 --- a/drivers/staging/comedi/drivers/comedi_fc.h +++ b/drivers/staging/comedi/drivers/comedi_fc.h @@ -47,19 +47,20 @@ unsigned int cfc_handle_events(struct comedi_device *, static inline unsigned int cfc_bytes_per_scan(struct comedi_subdevice *s) { - int num_samples; - int bits_per_sample; + unsigned int chanlist_len = s->async->cmd.chanlist_len; + unsigned int num_samples; + unsigned int bits_per_sample; switch (s->type) { case COMEDI_SUBD_DI: case COMEDI_SUBD_DO: case COMEDI_SUBD_DIO: bits_per_sample = 8 * bytes_per_sample(s); - num_samples = (s->async->cmd.chanlist_len + - bits_per_sample - 1) / bits_per_sample; + num_samples = (chanlist_len + bits_per_sample - 1) / + bits_per_sample; break; default: - num_samples = s->async->cmd.chanlist_len; + num_samples = chanlist_len; break; } return num_samples * bytes_per_sample(s); |