iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: ni_labpc_isadma: use comedi_cmd pointer

Browse Source 
Use a local variable to access the comedi_cmd as a pointer instead
of getting to from the comedi_async pointer.

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>
This commit is contained in:
H Hartley Sweeten 2014-05-27 10:31:01 -07:00 committed by Greg Kroah-Hartman
parent 9663ab1f9f
commit 3cd3195251
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/ni_labpc_isadma.c
View File

@ -87,6 +87,7 @@ void labpc_drain_dma(struct comedi_device *dev)
struct labpc_private *devpriv = dev->private; struct labpc_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev; struct comedi_subdevice *s = dev->read_subdev;
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
int status; int status;
unsigned long flags; unsigned long flags;
unsigned int max_points, num_points, residue, leftover; unsigned int max_points, num_points, residue, leftover;
@ -108,12 +109,12 @@ void labpc_drain_dma(struct comedi_device *dev)
*/ */
residue = get_dma_residue(devpriv->dma_chan) / sample_size; residue = get_dma_residue(devpriv->dma_chan) / sample_size;
num_points = max_points - residue; num_points = max_points - residue;
if (devpriv->count < num_points && async->cmd.stop_src == TRIG_COUNT) if (cmd->stop_src == TRIG_COUNT && devpriv->count < num_points)
num_points = devpriv->count; num_points = devpriv->count;
/* figure out how many points will be stored next time */ /* figure out how many points will be stored next time */
leftover = 0; leftover = 0;
if (async->cmd.stop_src != TRIG_COUNT) { if (cmd->stop_src != TRIG_COUNT) {
leftover = devpriv->dma_transfer_size / sample_size; leftover = devpriv->dma_transfer_size / sample_size;
} else if (devpriv->count > num_points) { } else if (devpriv->count > num_points) {
leftover = devpriv->count - num_points; leftover = devpriv->count - num_points;
@ -125,7 +126,7 @@ void labpc_drain_dma(struct comedi_device *dev)
for (i = 0; i < num_points; i++) for (i = 0; i < num_points; i++)
cfc_write_to_buffer(s, devpriv->dma_buffer[i]); cfc_write_to_buffer(s, devpriv->dma_buffer[i]);
if (async->cmd.stop_src == TRIG_COUNT) if (cmd->stop_src == TRIG_COUNT)
devpriv->count -= num_points; devpriv->count -= num_points;
/* set address and count for next transfer */ /* set address and count for next transfer */