staging: comedi: addi_apci_1564: use comedi_handle_event() for counters

The counter subdevice can generate an interrupt. Currently send_sig() is used
to let the task know when the interrupt occurs. Use the dev->read_subdev and
comedi_handle_events() instead.

Remove the, now unused, 'tsk_current' member from the private data and the
unnecessary include of <linux/sched.h>.

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>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index f0c0d58383ca7fb06a8cb88c2da4383689d531cb..d6b288020a6731c9b878d045ae86a7f3ba38ce7b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -6,8 +6,6 @@ static int apci1564_timer_insn_config(struct comedi_device *dev,
        struct apci1564_private *devpriv = dev->private;
        unsigned int ctrl;
 
-       devpriv->tsk_current = current;
-
        /* Stop the timer */
        ctrl = inl(devpriv->timer + ADDI_TCW_CTRL_REG);
        ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG |
@@ -101,8 +99,6 @@ static int apci1564_counter_insn_config(struct comedi_device *dev,
        unsigned long iobase = devpriv->counters + APCI1564_COUNTER(chan);
        unsigned int ctrl;
 
-       devpriv->tsk_current = current;
-
        /* Stop The Timer */
        ctrl = inl(iobase + ADDI_TCW_CTRL_REG);
        ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG |

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 45c1558a4961559d19077055212fa6855e4dd592..4af45d8bf3eccebe8b6a29d399c09e19bdbbbc05 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -23,7 +23,6 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/sched.h>
 
 #include "../comedi_pci.h"
 #include "addi_tcw.h"
@@ -118,6 +117,7 @@
  */
 #define APCI1564_EVENT_COS                     BIT(31)
 #define APCI1564_EVENT_TIMER                   BIT(30)
+#define APCI1564_EVENT_COUNTER(x)              BIT(27 + (x)) /* counter 0-2 */
 #define APCI1564_EVENT_MASK                    0xfff0000f /* all but [19:4] */
 
 struct apci1564_private {
@@ -127,7 +127,6 @@ struct apci1564_private {
        unsigned int mode1;     /* rising-edge/high level channels */
        unsigned int mode2;     /* falling-edge/low level channels */
        unsigned int ctrl;      /* interrupt mode OR (edge) . AND (level) */
-       struct task_struct *tsk_current;
 };
 
 #include "addi-data/hwdrv_apci1564.c"
@@ -200,21 +199,18 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
        }
 
        if (devpriv->counters) {
-               for (chan = 0; chan < 4; chan++) {
+               for (chan = 0; chan < 3; chan++) {
                        unsigned long iobase;
 
                        iobase = devpriv->counters + APCI1564_COUNTER(chan);
 
                        status = inl(iobase + ADDI_TCW_IRQ_REG);
-                       if (status & 0x01) {
-                               /*  Disable Counter Interrupt */
+                       if (status & ADDI_TCW_IRQ) {
+                               s->state |= APCI1564_EVENT_COUNTER(chan);
+
+                               /* clear the interrupt */
                                ctrl = inl(iobase + ADDI_TCW_CTRL_REG);
                                outl(0x0, iobase + ADDI_TCW_CTRL_REG);
-
-                               /* Send a signal to from kernel to user space */
-                               send_sig(SIGIO, devpriv->tsk_current, 0);
-
-                               /*  Enable Counter Interrupt */
                                outl(ctrl, iobase + ADDI_TCW_CTRL_REG);
                        }
                }