staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Interrupt_Acknowledge_Reg()

The "Interrupt Acknowledge" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple 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 b256c94..b5b5822 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -37,21 +37,7 @@
 #define NITIO_DMA_CFG_REG(x)           (NITIO_G0_DMA_CFG + (x))
 #define NITIO_DMA_STATUS_REG(x)                (NITIO_G0_DMA_STATUS + (x))
 #define NITIO_ABZ_REG(x)               (NITIO_G0_ABZ + (x))
-
-static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(unsigned idx)
-{
-       switch (idx) {
-       case 0:
-               return NITIO_G0_INT_ACK;
-       case 1:
-               return NITIO_G1_INT_ACK;
-       case 2:
-               return NITIO_G2_INT_ACK;
-       case 3:
-               return NITIO_G3_INT_ACK;
-       }
-       return 0;
-}
+#define NITIO_INT_ACK_REG(x)           (NITIO_G0_INT_ACK + (x))
 
 static inline enum ni_gpct_register NITIO_Gi_Status_Reg(unsigned idx)
 {

diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index e43dd17..4f59f5a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -397,7 +397,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
        }
        if (ack)
                write_register(counter, ack,
-                              NITIO_Gi_Interrupt_Acknowledge_Reg
+                              NITIO_INT_ACK_REG
                               (counter->counter_index));
        if (ni_tio_get_soft_copy
            (counter,