diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-19 16:31:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 11:49:32 -0800 |
| commit | cc7a164b1686e233fa9d8f796e1b657379cd9278 (patch) | |
| tree | eaa66e1ff8b6d8f84b6a91a5b7fc2812d7818634 /drivers/staging/comedi | |
| parent | 720712f439b3f02bcf473efe83ece259d97ce455 (diff) | |
staging: comedi: ni_tio_internal.h: replace NITIO_Gi_LoadB_Reg()
The "LoadB" 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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 14 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio_internal.h | 16 |
2 files changed, 8 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index f203a6c07f86..2d20e8d2cbe7 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -387,11 +387,11 @@ void ni_tio_init_counter(struct ni_gpct *counter) counter_dev-> regs[NITIO_LOADA_REG(counter->counter_index)], NITIO_LOADA_REG(counter->counter_index)); - counter_dev->regs[NITIO_Gi_LoadB_Reg(counter->counter_index)] = 0x0; + counter_dev->regs[NITIO_LOADB_REG(counter->counter_index)] = 0x0; write_register(counter, counter_dev-> - regs[NITIO_Gi_LoadB_Reg(counter->counter_index)], - NITIO_Gi_LoadB_Reg(counter->counter_index)); + regs[NITIO_LOADB_REG(counter->counter_index)], + NITIO_LOADB_REG(counter->counter_index)); ni_tio_set_bits(counter, NITIO_Gi_Input_Select_Reg(counter->counter_index), ~0, 0); @@ -1669,7 +1669,7 @@ int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn, case 2: data[0] = counter_dev-> - regs[NITIO_Gi_LoadB_Reg(counter->counter_index)]; + regs[NITIO_LOADB_REG(counter->counter_index)]; break; } return 0; @@ -1683,7 +1683,7 @@ static unsigned ni_tio_next_load_register(struct ni_gpct *counter) counter_index)); if (bits & Gi_Next_Load_Source_Bit(counter->counter_index)) - return NITIO_Gi_LoadB_Reg(counter->counter_index); + return NITIO_LOADB_REG(counter->counter_index); else return NITIO_LOADA_REG(counter->counter_index); } @@ -1716,10 +1716,10 @@ int ni_tio_winsn(struct ni_gpct *counter, struct comedi_insn *insn, NITIO_LOADA_REG(counter->counter_index)); break; case 2: - counter_dev->regs[NITIO_Gi_LoadB_Reg(counter->counter_index)] = + counter_dev->regs[NITIO_LOADB_REG(counter->counter_index)] = data[0]; write_register(counter, data[0], - NITIO_Gi_LoadB_Reg(counter->counter_index)); + NITIO_LOADB_REG(counter->counter_index)); break; default: return -EINVAL; diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index 1df787054bf9..d4176bf3c53a 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h @@ -26,6 +26,7 @@ #define NITIO_SW_SAVE_REG(x) (NITIO_G0_SW_SAVE + (x)) #define NITIO_MODE_REG(x) (NITIO_G0_MODE + (x)) #define NITIO_LOADA_REG(x) (NITIO_G0_LOADA + (x)) +#define NITIO_LOADB_REG(x) (NITIO_G0_LOADB + (x)) static inline enum ni_gpct_register NITIO_Gi_Counting_Mode_Reg(unsigned idx) { @@ -109,21 +110,6 @@ static inline enum ni_gpct_register NITIO_Gxx_Status_Reg(unsigned idx) return 0; } -static inline enum ni_gpct_register NITIO_Gi_LoadB_Reg(unsigned idx) -{ - switch (idx) { - case 0: - return NITIO_G0_LOADB; - case 1: - return NITIO_G1_LOADB; - case 2: - return NITIO_G2_LOADB; - case 3: - return NITIO_G3_LOADB; - } - return 0; -} - static inline enum ni_gpct_register NITIO_Gi_Second_Gate_Reg(unsigned idx) { switch (idx) { |