leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: usbdux: 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:37 -07:00 committed by Greg Kroah-Hartman
parent 66e3015f6e
commit 40642e9585
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/usbdux.c
View File

@ -207,7 +207,6 @@ struct usbdux_private {
unsigned int high_speed:1; unsigned int high_speed:1;
unsigned int ai_cmd_running:1; unsigned int ai_cmd_running:1;
unsigned int ai_continous:1;
unsigned int ao_cmd_running:1; unsigned int ao_cmd_running:1;
unsigned int ao_continous:1; unsigned int ao_continous:1;
unsigned int pwm_cmd_running:1; unsigned int pwm_cmd_running:1;
@ -266,6 +265,7 @@ static void usbduxsub_ai_isoc_irq(struct urb *urb)
struct comedi_device *dev = urb->context; struct comedi_device *dev = urb->context;
struct comedi_subdevice *s = dev->read_subdev; struct comedi_subdevice *s = dev->read_subdev;
struct usbdux_private *devpriv = dev->private; struct usbdux_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
int i, err, n; int i, err, n;
/* first we test if something unusual has just happened */ /* first we test if something unusual has just happened */
@ -349,7 +349,7 @@ static void usbduxsub_ai_isoc_irq(struct urb *urb)
devpriv->ai_counter = devpriv->ai_timer; devpriv->ai_counter = devpriv->ai_timer;
/* test, if we transmit only a fixed number of samples */ /* test, if we transmit only a fixed number of samples */
if (!devpriv->ai_continous) { if (cmd->stop_src == TRIG_COUNT) {
/* not continuous, fixed number of samples */ /* not continuous, fixed number of samples */
devpriv->ai_sample_count--; devpriv->ai_sample_count--;
/* all samples received? */ /* all samples received? */
@ -778,10 +778,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
if (cmd->stop_src == TRIG_COUNT) { if (cmd->stop_src == TRIG_COUNT) {
/* data arrives as one packet */ /* data arrives as one packet */
devpriv->ai_sample_count = cmd->stop_arg; devpriv->ai_sample_count = cmd->stop_arg;
devpriv->ai_continous = 0;
} else { } else {
/* continous acquisition */ /* continous acquisition */
devpriv->ai_continous = 1;
devpriv->ai_sample_count = 0; devpriv->ai_sample_count = 0;
} }