diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-09-09 16:16:01 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-11 14:35:21 -0700 |
| commit | e37b20aa58d8b6e4df41222f4aacf2b055c973b2 (patch) | |
| tree | 19cb4bf2443099400981c0c7c8d9c2273fc792d9 /drivers/staging/comedi | |
| parent | staging: comedi: rtd520: prevent "empty acquisition" async command (diff) | |
| download | linux-dev-e37b20aa58d8b6e4df41222f4aacf2b055c973b2.tar.xz linux-dev-e37b20aa58d8b6e4df41222f4aacf2b055c973b2.zip | |
staging: comedi: s626: remove 'ai_continuous' from private data
This member of the private data is set based on the cmd->stop_src. Just use the
cmd->stop_src directly and remove the member.
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 051a727a87e9..aac661790dc4 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -78,7 +78,6 @@ struct s626_buffer_dma { struct s626_private { uint8_t ai_cmd_running; /* ai_cmd is running */ - uint8_t ai_continuous; /* continuous acquisition */ int ai_sample_count; /* number of samples to acquire */ unsigned int ai_sample_timer; /* time between samples in * units of the timer */ @@ -1502,7 +1501,7 @@ static bool s626_handle_eos_interrupt(struct comedi_device *dev) /* end of scan occurs */ async->events |= COMEDI_CB_EOS; - if (!devpriv->ai_continuous) + if (cmd->stop_src == TRIG_COUNT) devpriv->ai_sample_count--; if (devpriv->ai_sample_count <= 0) { devpriv->ai_cmd_running = 0; @@ -2106,11 +2105,9 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) case TRIG_COUNT: /* data arrives as one packet */ devpriv->ai_sample_count = cmd->stop_arg; - devpriv->ai_continuous = 0; break; case TRIG_NONE: /* continuous acquisition */ - devpriv->ai_continuous = 1; devpriv->ai_sample_count = 1; break; } |