The shared "Reset" 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@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/ni_tio.c | 2 +-
drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +-------------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index 7da8228..6fcaebd 100644
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -363,7 +363,7 @@ static int ni_tio_second_gate_registers_present(const struct ni_gpct_device
static void ni_tio_reset_count_and_disarm(struct ni_gpct *counter)
{
write_register(counter, Gi_Reset_Bit(counter->counter_index),
- NITIO_Gxx_Joint_Reset_Reg(counter->counter_index));
+ NITIO_RESET_REG(counter->counter_index));
}
void ni_tio_init_counter(struct ni_gpct *counter)
diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index 604fa69..f9eb2d0 100644
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -31,19 +31,7 @@
#define NITIO_CNT_MODE_REG(x) (NITIO_G0_CNT_MODE + (x))
#define NITIO_GATE2_REG(x) (NITIO_G0_GATE2 + (x))
#define NITIO_STATUS_REG(x) (NITIO_G01_STATUS + ((x) / 2))
-
-static inline enum ni_gpct_register NITIO_Gxx_Joint_Reset_Reg(unsigned idx)
-{
- switch (idx) {
- case 0:
- case 1:
- return NITIO_G01_RESET;
- case 2:
- case 3:
- return NITIO_G23_RESET;
- }
- return 0;
-}
+#define NITIO_RESET_REG(x) (NITIO_G01_RESET + ((x) / 2))
static inline enum ni_gpct_register NITIO_Gxx_Joint_Status1_Reg(unsigned idx)
{
--
1.8.5.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
