staging: comedi: ni_tio: tidy up Gi_Status_Bits

Convert this enum into defines and rename the CamelCase symbols.

For aesthetics, move the new defines so they are associated with
the register define.

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/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index 8d1b254c37aab6c21c9016a800f6f425fb0fa749..37cdb4960803444fb9fddebed2c46b9273777e16 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -149,14 +149,11 @@
 #define GI_TC_INTERRUPT_ACK            (1 << 14)
 #define GI_GATE_INTERRUPT_ACK          (1 << 15)
 #define NITIO_STATUS_REG(x)            (NITIO_G0_STATUS + (x))
+#define GI_GATE_INTERRUPT              (1 << 2)
+#define GI_TC                          (1 << 3)
+#define GI_INTERRUPT                   (1 << 15)
 #define NITIO_INT_ENA_REG(x)           (NITIO_G0_INT_ENA + (x))
 
-enum Gi_Status_Bits {
-       Gi_Gate_Interrupt_Bit = 0x4,
-       Gi_TC_Bit = 0x8,
-       Gi_Interrupt_Bit = 0x8000
-};
-
 enum G02_Interrupt_Enable_Bits {
        G0_TC_Interrupt_Enable_Bit = 0x40,
        G0_Gate_Interrupt_Enable_Bit = 0x100

diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index 43a7bee55052e44bf4e265e095508b6330c658c2..3ec8995f0cf429df05c9daac9e511866954aeb4f 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -394,9 +394,9 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
                if (tc_error)
                        *tc_error = 1;
        }
-       if (gi_status & Gi_TC_Bit)
+       if (gi_status & GI_TC)
                ack |= GI_TC_INTERRUPT_ACK;
-       if (gi_status & Gi_Gate_Interrupt_Bit) {
+       if (gi_status & GI_GATE_INTERRUPT) {
                if (should_ack_gate(counter))
                        ack |= GI_GATE_INTERRUPT_ACK;
        }