diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-08-12 13:25:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-14 18:36:18 -0700 |
| commit | 020e05e74d49fc4c5cecee1b779247ec8a243b1f (patch) | |
| tree | 69a4b91d51121bbf9d98e377cc0d2c46d2b1198c /drivers | |
| parent | cd5d0ae4814f4f943c97c83f7f2f393a99b4d3a0 (diff) | |
| download | op-kernel-dev-020e05e74d49fc4c5cecee1b779247ec8a243b1f.zip op-kernel-dev-020e05e74d49fc4c5cecee1b779247ec8a243b1f.tar.gz | |
staging: comedi: addi_apci_3501: remove "magic" numbers in apci3501_interrupt()
Use register bit defines from addi_tcw.h to remove the "magic" numbers.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3501.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c index 4faa23b..40ff914 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -262,11 +262,12 @@ static irqreturn_t apci3501_interrupt(int irq, void *d) /* Disable Interrupt */ ctrl = inl(devpriv->tcw + ADDI_TCW_CTRL_REG); - ctrl &= 0xfffff9fd; + ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG | + ADDI_TCW_CTRL_IRQ_ENA); outl(ctrl, devpriv->tcw + ADDI_TCW_CTRL_REG); - status = inl(devpriv->tcw + ADDI_TCW_IRQ_REG) & 0x1; - if (!status) { + status = inl(devpriv->tcw + ADDI_TCW_IRQ_REG); + if (!(status & ADDI_TCW_IRQ)) { dev_err(dev->class_dev, "IRQ from unknown source\n"); return IRQ_NONE; } @@ -274,8 +275,9 @@ static irqreturn_t apci3501_interrupt(int irq, void *d) /* Enable Interrupt Send a signal to from kernel to user space */ send_sig(SIGIO, devpriv->tsk_Current, 0); ctrl = inl(devpriv->tcw + ADDI_TCW_CTRL_REG); - ctrl &= 0xfffff9fd; - ctrl |= 1 << 1; + ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG | + ADDI_TCW_CTRL_IRQ_ENA); + ctrl |= ADDI_TCW_CTRL_IRQ_ENA; outl(ctrl, devpriv->tcw + ADDI_TCW_CTRL_REG); inl(devpriv->tcw + ADDI_TCW_STATUS_REG); |
