]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: comedi: addi_apci_3120: remove APCI3120_DISABLE_EOC_INT
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 4 Nov 2014 17:54:21 +0000 (10:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 17:34:00 +0000 (09:34 -0800)
For aesthetics, remove this define and just use ~APCI3120_ENABLE_EOC_INT.

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>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

index 31920b6876b5248092ce7c85f79d631caa0e1f86..545bc90234d5e1b4dfd3a1b8ad7dc93b5cb3f4bc 100644 (file)
@@ -91,7 +91,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 #define APCI3120_DISABLE_EOS_INT       (~APCI3120_ENABLE_EOS_INT)
 #define APCI3120_ENABLE_EOC_INT                0x1
-#define APCI3120_DISABLE_EOC_INT       (~APCI3120_ENABLE_EOC_INT)
 
 /* status register bits */
 #define APCI3120_EOC                   0x8000
@@ -968,7 +967,7 @@ static irqreturn_t apci3120_interrupt(int irq, void *d)
                        send_sig(SIGIO, devpriv->tsk_Current, 0);       /*  send signal to the sample */
                } else {
                        /* Disable EOC Interrupt */
-                       devpriv->mode &= APCI3120_DISABLE_EOC_INT;
+                       devpriv->mode &= ~APCI3120_ENABLE_EOC_INT;
                        outb(devpriv->mode,
                             dev->iobase + APCI3120_WRITE_MODE_SELECT);
                }
@@ -1096,7 +1095,7 @@ static int apci3120_config_insn_timer(struct comedi_device *dev,
                         ~APCI3120_ENABLE_TIMER_COUNTER;
 
        /*  Disable Eoc and Eos Interrupts */
-       devpriv->mode &= APCI3120_DISABLE_EOC_INT & APCI3120_DISABLE_EOS_INT;
+       devpriv->mode &= ~APCI3120_ENABLE_EOC_INT & APCI3120_DISABLE_EOS_INT;
        outb(devpriv->mode, dev->iobase + APCI3120_WRITE_MODE_SELECT);
 
        if (data[0] == APCI3120_TIMER) {        /* initialize timer */