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

The timer 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.

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_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 9350f592c8b6786cd59cdef297c09f5f2a3097ce..45c1558a4961559d19077055212fa6855e4dd592 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -117,6 +117,7 @@
  * the state of the interrupt capable inputs.
  */
 #define APCI1564_EVENT_COS                     BIT(31)
+#define APCI1564_EVENT_TIMER                   BIT(30)
 #define APCI1564_EVENT_MASK                    0xfff0000f /* all but [19:4] */
 
 struct apci1564_private {
@@ -189,15 +190,12 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
        }
 
        status = inl(devpriv->timer + ADDI_TCW_IRQ_REG);
-       if (status & 0x01) {
-               /*  Disable Timer Interrupt */
+       if (status & ADDI_TCW_IRQ) {
+               s->state |= APCI1564_EVENT_TIMER;
+
+               /* clear the interrupt */
                ctrl = inl(devpriv->timer + ADDI_TCW_CTRL_REG);
                outl(0x0, devpriv->timer + ADDI_TCW_CTRL_REG);
-
-               /* Send a signal to from kernel to user space */
-               send_sig(SIGIO, devpriv->tsk_current, 0);
-
-               /*  Enable Timer Interrupt */
                outl(ctrl, devpriv->timer + ADDI_TCW_CTRL_REG);
        }