UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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:39 -07:00 committed by Greg Kroah-Hartman
parent c8f3174a90
commit 61ff4709a5
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/usbduxfast.c
View File

@ -154,7 +154,6 @@ struct usbduxfast_private {
uint8_t *duxbuf; uint8_t *duxbuf;
int8_t *inbuf; int8_t *inbuf;
short int ai_cmd_running; /* asynchronous command is running */ short int ai_cmd_running; /* asynchronous command is running */
short int ai_continous; /* continous acquisition */
long int ai_sample_count; /* number of samples to acquire */ long int ai_sample_count; /* number of samples to acquire */
int ignore; /* counter which ignores the first int ignore; /* counter which ignores the first
buffers */ buffers */
@ -239,6 +238,7 @@ static void usbduxfast_ai_interrupt(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 comedi_async *async = s->async; struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
struct usb_device *usb = comedi_to_usb_dev(dev); struct usb_device *usb = comedi_to_usb_dev(dev);
struct usbduxfast_private *devpriv = dev->private; struct usbduxfast_private *devpriv = dev->private;
int n, err; int n, err;
@ -285,7 +285,7 @@ static void usbduxfast_ai_interrupt(struct urb *urb)
} }
if (!devpriv->ignore) { if (!devpriv->ignore) {
if (!devpriv->ai_continous) { if (cmd->stop_src == TRIG_COUNT) {
/* not continuous, fixed number of samples */ /* not continuous, fixed number of samples */
n = urb->actual_length / sizeof(uint16_t); n = urb->actual_length / sizeof(uint16_t);
if (unlikely(devpriv->ai_sample_count < n)) { if (unlikely(devpriv->ai_sample_count < n)) {
@ -817,10 +817,8 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
up(&devpriv->sem); up(&devpriv->sem);
return -EFAULT; return -EFAULT;
} }
devpriv->ai_continous = 0;
} else { } else {
/* continous acquisition */ /* continous acquisition */
devpriv->ai_continous = 1;
devpriv->ai_sample_count = 0; devpriv->ai_sample_count = 0;
} }