staging: comedi: addi_apci_3120: remove APCI3120_DISABLE_ALL_INTERRUPT_WITHOUT_TIMER

At the start of apci3120_ai_insn_read() the devpriv->b_ModeSelectRegister is set
to '0'. Remove the unnecessary masking to clear the interrupt enable bits.

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-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index cb2856da34fb8bde4d579fdc2ea0cce4023e507e..2dd8e665d4719e3cc834f9445856f756f374b812 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -92,8 +92,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)
-#define APCI3120_DISABLE_ALL_INTERRUPT_WITHOUT_TIMER   \
-       (APCI3120_DISABLE_EOS_INT & APCI3120_DISABLE_EOC_INT)
 #define APCI3120_DISABLE_ALL_INTERRUPT                 \
        (APCI3120_DISABLE_TIMER_INT & APCI3120_DISABLE_EOS_INT & APCI3120_DISABLE_EOC_INT)
 
@@ -270,11 +268,6 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
                                        APCI3120_ENABLE_EOC_INT;
                                inw(dev->iobase + 0);
 
-                       } else {
-                               devpriv->b_ModeSelectRegister =
-                                       devpriv->
-                                       b_ModeSelectRegister &
-                                       APCI3120_DISABLE_ALL_INTERRUPT_WITHOUT_TIMER;
                        }
 
                        outb(devpriv->b_ModeSelectRegister,
@@ -337,11 +330,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
                                        APCI3120_ENABLE_EOS_INT;
                                inw(dev->iobase + 0);
 
-                       } else
-                               devpriv->b_ModeSelectRegister =
-                                       devpriv->
-                                       b_ModeSelectRegister &
-                                       APCI3120_DISABLE_ALL_INTERRUPT_WITHOUT_TIMER;
+                       }
 
                        outb(devpriv->b_ModeSelectRegister,
                             dev->iobase + APCI3120_WRITE_MODE_SELECT);