staging: comedi: hwdrv_apci3501: remove "magic" numbers in apci3501_write_insn_timer()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 12 Aug 2015 20:25:49 +0000 (13:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Aug 2015 01:36:18 +0000 (18:36 -0700)
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>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c

index c4a72a5b343f2e98f4b01c3de96d2e2ec107014c..d971f7a0926f748966dc11d7f18cef82fa4362a9 100644 (file)
@@ -93,17 +93,17 @@ static int apci3501_write_insn_timer(struct comedi_device *dev,
        if (devpriv->timer_mode == ADDIDATA_WATCHDOG ||
            devpriv->timer_mode == ADDIDATA_TIMER) {
                ctrl = inl(devpriv->tcw + ADDI_TCW_CTRL_REG);
-               ctrl &= 0xfffff9ff;
+               ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG);
 
                if (data[1] == 1) {             /* enable */
-                       ctrl |= 0x1;
+                       ctrl |= ADDI_TCW_CTRL_ENA;
                } else if (data[1] == 0) {      /* stop */
                        if (devpriv->timer_mode == ADDIDATA_WATCHDOG)
                                ctrl = 0;
                        else
-                               ctrl &= ~0x1;
+                               ctrl &= ~ADDI_TCW_CTRL_ENA;
                } else if (data[1] == 2) {      /* trigger */
-                       ctrl |= 0x200;
+                       ctrl |= ADDI_TCW_CTRL_TRIG;
                }
                outl(ctrl, devpriv->tcw + ADDI_TCW_CTRL_REG);
        }