From: H Hartley Sweeten Date: Tue, 27 May 2014 17:31:05 +0000 (-0700) Subject: staging: comedi: comedi_fc: use comedi_cmd pointer X-Git-Tag: next-20140530~19^2~31 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ba01fe6188196be85d0a384395c7b5a0f4b8546;p=karo-tx-linux.git staging: comedi: comedi_fc: use comedi_cmd pointer Use a local variable to access the comedi_cmd as a pointer instead of getting to from the comedi_subdevice pointer. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/comedi_fc.c b/drivers/staging/comedi/drivers/comedi_fc.c index cf3da2cb0cc1..c33c3e5680a6 100644 --- a/drivers/staging/comedi/drivers/comedi_fc.c +++ b/drivers/staging/comedi/drivers/comedi_fc.c @@ -24,7 +24,7 @@ unsigned int cfc_bytes_per_scan(struct comedi_subdevice *s) { - unsigned int chanlist_len = s->async->cmd.chanlist_len; + struct comedi_cmd *cmd = &s->async->cmd; unsigned int num_samples; unsigned int bits_per_sample; @@ -33,11 +33,11 @@ unsigned int cfc_bytes_per_scan(struct comedi_subdevice *s) case COMEDI_SUBD_DO: case COMEDI_SUBD_DIO: bits_per_sample = 8 * bytes_per_sample(s); - num_samples = (chanlist_len + bits_per_sample - 1) / + num_samples = (cmd->chanlist_len + bits_per_sample - 1) / bits_per_sample; break; default: - num_samples = chanlist_len; + num_samples = cmd->chanlist_len; break; } return num_samples * bytes_per_sample(s);