redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: comedi: usbduxsigma: remove 'ai_continuous' from private data

Browse source 
This member of the private data can be determined from the cmd->stop_src.
Do that instead.

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:30:40 -07:00 committed by Greg Kroah-Hartman
parent 61ff4709a5
commit fee5ba92cd
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/usbduxsigma.c
View file

@ -166,7 +166,6 @@ struct usbduxsigma_private {
unsigned high_speed:1;
unsigned ai_cmd_running:1;
unsigned ai_continuous:1;
unsigned ao_cmd_running:1;
unsigned ao_continuous:1;
unsigned pwm_cmd_running:1;
@ -223,6 +222,7 @@ static void usbduxsigma_ai_urb_complete(struct urb *urb)
struct comedi_device *dev = urb->context;
struct usbduxsigma_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned int dio_state;
uint32_t val;
int ret;
@ -301,7 +301,7 @@ static void usbduxsigma_ai_urb_complete(struct urb *urb)
/* timer zero, transfer measurements to comedi */
devpriv->ai_counter = devpriv->ai_timer;
if (!devpriv->ai_continuous) {
if (cmd->stop_src == TRIG_COUNT) {
/* not continuous, fixed number of samples */
devpriv->ai_sample_count--;
if (devpriv->ai_sample_count < 0) {
@ -596,10 +596,8 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev,
if (cmd->stop_src == TRIG_COUNT) {
/* data arrives as one packet */
devpriv->ai_sample_count = cmd->stop_arg;
devpriv->ai_continuous = 0;
} else {
/* continuous acquisition */
devpriv->ai_continuous = 1;
devpriv->ai_sample_count = 0;
}