UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2016-06-08 11:26:39 -07:00 committed by Greg Kroah-Hartman
parent 931987a0c6
commit ff9842b651
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/addi_apci_1564.c
View File

@ -117,6 +117,7 @@
* the state of the interrupt capable inputs. * the state of the interrupt capable inputs.
*/ */
#define APCI1564_EVENT_COS BIT(31) #define APCI1564_EVENT_COS BIT(31)
#define APCI1564_EVENT_TIMER BIT(30)
#define APCI1564_EVENT_MASK 0xfff0000f /* all but [19:4] */ #define APCI1564_EVENT_MASK 0xfff0000f /* all but [19:4] */
struct apci1564_private { struct apci1564_private {
@ -189,15 +190,12 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
} }
status = inl(devpriv->timer + ADDI_TCW_IRQ_REG); status = inl(devpriv->timer + ADDI_TCW_IRQ_REG);
if (status & 0x01) { if (status & ADDI_TCW_IRQ) {
/* Disable Timer Interrupt */ s->state |= APCI1564_EVENT_TIMER;
/* clear the interrupt */
ctrl = inl(devpriv->timer + ADDI_TCW_CTRL_REG); ctrl = inl(devpriv->timer + ADDI_TCW_CTRL_REG);
outl(0x0, 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); outl(ctrl, devpriv->timer + ADDI_TCW_CTRL_REG);
} }