[PATCH v2 05/12] staging: comedi: adv_pci1710: remove 'ai_eos' from private data

[H Hartley Sweeten]

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 <hswee...@visionengravers.com>
Reviewed-by: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/adv_pci1710.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c 
b/drivers/staging/comedi/drivers/adv_pci1710.c
index 4c9454e..6bdd915 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -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;
@@ -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 */
@@ -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;
 }
 
@@ -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:
-- 
1.9.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel