Skip to content

Commit

Permalink
staging: comedi: adv_pci1710: remove 'ai_eos' from private data
Browse files Browse the repository at this point in the history
This member of the private data is is not necessary. We can just check the
cmd->flags for TRIG_WAKE_EOS when needed. Remvoe 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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed May 4, 2014
1 parent 17ac5ec commit 5297a6b
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ struct pci1710_private {
unsigned int i8254_osc_base; /* frequence of onboard oscilator */
unsigned int ai_act_scan; /* how many scans we finished */
unsigned int ai_act_chan; /* actual position in actual scan */
unsigned char ai_eos; /* 1=EOS wake up */
unsigned char ai_et;
unsigned int ai_et_CntrlReg;
unsigned int ai_et_MuxVal;
Expand Down Expand Up @@ -916,9 +915,15 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
{
struct comedi_device *dev = d;
struct pci1710_private *devpriv = dev->private;
struct comedi_subdevice *s;
struct comedi_cmd *cmd;

if (!dev->attached) /* is device attached? */
return IRQ_NONE; /* no, exit */

s = dev->read_subdev;
cmd = &s->async->cmd;

/* is this interrupt from our board? */
if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ))
return IRQ_NONE; /* no, exit */
Expand All @@ -937,11 +942,12 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
start_pacer(dev, 1, devpriv->ai_et_div1, devpriv->ai_et_div2);
return IRQ_HANDLED;
}
if (devpriv->ai_eos) { /* We use FIFO half full INT or not? */

if (cmd->flags & TRIG_WAKE_EOS)
interrupt_pci1710_every_sample(d);
} else {
else
interrupt_pci1710_half_fifo(d);
}

return IRQ_HANDLED;
}

Expand Down Expand Up @@ -973,13 +979,8 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
s->async->cur_chan = 0;

devpriv->CntrlReg &= Control_CNT0;
/* don't we want wake up every scan? devpriv->ai_eos=1; */
if (cmd->flags & TRIG_WAKE_EOS) {
devpriv->ai_eos = 1;
} else {
if ((cmd->flags & TRIG_WAKE_EOS) == 0)
devpriv->CntrlReg |= Control_ONEFH;
devpriv->ai_eos = 0;
}

switch (mode) {
case 1:
Expand Down

0 comments on commit 5297a6b

Please sign in to comment.