AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 13:45:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: pcl711: use comedi_async 'scans_done' to detect EOA

Browse Source 
Remove the private data member 'ntrig' and use the comedi_async 'scans_done'
member to detect the end-of-acquisition.

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-11-05 10:20:55 -07:00 committed by Greg Kroah-Hartman
parent e268240387
commit 8712f901c9
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/comedi/drivers/pcl711.c
View File

@ -156,7 +156,6 @@ static const struct pcl711_board boardtypes[] = {
}; };
struct pcl711_private { struct pcl711_private {
unsigned int ntrig;
unsigned int divisor1; unsigned int divisor1;
unsigned int divisor2; unsigned int divisor2;
}; };
@ -199,7 +198,6 @@ static int pcl711_ai_cancel(struct comedi_device *dev,
static irqreturn_t pcl711_interrupt(int irq, void *d) static irqreturn_t pcl711_interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct pcl711_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev; struct comedi_subdevice *s = dev->read_subdev;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
unsigned int data; unsigned int data;
@ -213,10 +211,12 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)
outb(PCL711_INT_STAT_CLR, dev->iobase + PCL711_INT_STAT_REG); outb(PCL711_INT_STAT_CLR, dev->iobase + PCL711_INT_STAT_REG);
if (comedi_buf_write_samples(s, &data, 1)) { comedi_buf_write_samples(s, &data, 1);
if (cmd->stop_src == TRIG_COUNT && !(--devpriv->ntrig))
s->async->events |= COMEDI_CB_EOA; if (cmd->stop_src == TRIG_COUNT &&
} s->async->scans_done >= cmd->stop_arg)
s->async->events |= COMEDI_CB_EOA;
comedi_handle_events(dev, s); comedi_handle_events(dev, s);
return IRQ_HANDLED; return IRQ_HANDLED;
@ -369,14 +369,10 @@ static void pcl711_ai_load_counters(struct comedi_device *dev)
static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct pcl711_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
pcl711_set_changain(dev, s, cmd->chanlist[0]); pcl711_set_changain(dev, s, cmd->chanlist[0]);
if (cmd->stop_src == TRIG_COUNT)
devpriv->ntrig = cmd->stop_arg;
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
pcl711_ai_load_counters(dev); pcl711_ai_load_counters(dev);
outb(PCL711_INT_STAT_CLR, dev->iobase + PCL711_INT_STAT_REG); outb(PCL711_INT_STAT_CLR, dev->iobase + PCL711_INT_STAT_REG);