Commit 6b62e757 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: das16m1: tidy up clear interrupt register define

Rename this define and use a consistent comment throughout the code.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4246a637
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
#define DAS16M1_CS_IRQDATA BIT(7) #define DAS16M1_CS_IRQDATA BIT(7)
#define DAS16M1_DI_REG 0x03 #define DAS16M1_DI_REG 0x03
#define DAS16M1_DO_REG 0x03 #define DAS16M1_DO_REG 0x03
#define DAS16M1_CLEAR_INTR 4 #define DAS16M1_CLR_INTR_REG 0x04
#define DAS16M1_INTR_CONTROL 5 #define DAS16M1_INTR_CONTROL 5
#define EXT_PACER 0x2 #define EXT_PACER 0x2
#define INT_PACER 0x3 #define INT_PACER 0x3
...@@ -276,8 +276,9 @@ static int das16m1_cmd_exec(struct comedi_device *dev, ...@@ -276,8 +276,9 @@ static int das16m1_cmd_exec(struct comedi_device *dev,
byte |= DAS16M1_CS_EXT_TRIG; byte |= DAS16M1_CS_EXT_TRIG;
outb(byte, dev->iobase + DAS16M1_CS_REG); outb(byte, dev->iobase + DAS16M1_CS_REG);
/* clear interrupt bit */
outb(0, dev->iobase + DAS16M1_CLEAR_INTR); /* clear interrupt */
outb(0, dev->iobase + DAS16M1_CLR_INTR_REG);
devpriv->control_state |= INTE; devpriv->control_state |= INTE;
outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL); outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL);
...@@ -330,8 +331,8 @@ static int das16m1_ai_rinsn(struct comedi_device *dev, ...@@ -330,8 +331,8 @@ static int das16m1_ai_rinsn(struct comedi_device *dev,
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
unsigned short val; unsigned short val;
/* clear DAS16M1_CS_IRQDATA bit */ /* clear interrupt */
outb(0, dev->iobase + DAS16M1_CLEAR_INTR); outb(0, dev->iobase + DAS16M1_CLR_INTR_REG);
/* trigger conversion */ /* trigger conversion */
outb(0, dev->iobase + DAS16M1_AI_REG); outb(0, dev->iobase + DAS16M1_AI_REG);
...@@ -476,7 +477,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d) ...@@ -476,7 +477,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d)
das16m1_handler(dev, status); das16m1_handler(dev, status);
/* clear interrupt */ /* clear interrupt */
outb(0, dev->iobase + DAS16M1_CLEAR_INTR); outb(0, dev->iobase + DAS16M1_CLR_INTR_REG);
spin_unlock(&dev->spinlock); spin_unlock(&dev->spinlock);
return IRQ_HANDLED; return IRQ_HANDLED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment