]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_tio: remove counter_status_mask
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 24 Jul 2014 17:14:44 +0000 (10:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Jul 2014 18:16:47 +0000 (11:16 -0700)
For aesthetics, remove this global static const varaible.

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/ni_tio.c

index 9b5ab0bf5bfec7e95f1e6bb5de719fb704732a78..6da4ab5883856bf4f0b4d9e2e2d2ec08af123c70 100644 (file)
@@ -189,9 +189,6 @@ enum ni_660x_second_gate_select {
 #define NI_660X_UD_PIN_GATE2_SEL(x)    (0x2 + (x))
 #define NI_660X_RTSI_GATE2_SEL(x)      (0xb + (x))
 
-static const unsigned int counter_status_mask =
-       COMEDI_COUNTER_ARMED | COMEDI_COUNTER_COUNTING;
-
 struct ni_gpct_device *
 ni_gpct_device_construct(struct comedi_device *dev,
                         void (*write_register)(struct ni_gpct *counter,
@@ -1387,7 +1384,7 @@ int ni_tio_insn_config(struct comedi_device *dev,
                return 0;
        case INSN_CONFIG_GET_COUNTER_STATUS:
                data[1] = ni_tio_counter_status(counter);
-               data[2] = counter_status_mask;
+               data[2] = COMEDI_COUNTER_ARMED | COMEDI_COUNTER_COUNTING;
                return 0;
        case INSN_CONFIG_SET_CLOCK_SRC:
                return ni_tio_set_clock_src(counter, data[1], data[2]);