diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-20 03:31:38 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 23:49:31 +0400 |
| commit | 720712f439b3f02bcf473efe83ece259d97ce455 (patch) | |
| tree | ac7b7ff00695c45a2f67e445af3adad315c1cb6c /drivers/staging/comedi | |
| parent | 0101791e83cbd9076c34bf138d1407442dfdf95f (diff) | |
| download | linux-720712f439b3f02bcf473efe83ece259d97ce455.tar.xz | |
staging: comedi: ni_tio_internal.h: replace NITIO_Gi_LoadA_Reg()
The "LoadA" 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 5b46324e77de..f203a6c07f86 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -382,11 +382,11 @@ void ni_tio_init_counter(struct ni_gpct *counter) ~0, Gi_Synchronize_Gate_Bit); ni_tio_set_bits(counter, NITIO_MODE_REG(counter->counter_index), ~0, 0); - counter_dev->regs[NITIO_Gi_LoadA_Reg(counter->counter_index)] = 0x0; + counter_dev->regs[NITIO_LOADA_REG(counter->counter_index)] = 0x0; write_register(counter, counter_dev-> - regs[NITIO_Gi_LoadA_Reg(counter->counter_index)], - NITIO_Gi_LoadA_Reg(counter->counter_index)); + regs[NITIO_LOADA_REG(counter->counter_index)], + NITIO_LOADA_REG(counter->counter_index)); counter_dev->regs[NITIO_Gi_LoadB_Reg(counter->counter_index)] = 0x0; write_register(counter, counter_dev-> @@ -1664,7 +1664,7 @@ int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn, case 1: data[0] = counter_dev-> - regs[NITIO_Gi_LoadA_Reg(counter->counter_index)]; + regs[NITIO_LOADA_REG(counter->counter_index)]; break; case 2: data[0] = @@ -1685,7 +1685,7 @@ static unsigned ni_tio_next_load_register(struct ni_gpct *counter) if (bits & Gi_Next_Load_Source_Bit(counter->counter_index)) return NITIO_Gi_LoadB_Reg(counter->counter_index); else - return NITIO_Gi_LoadA_Reg(counter->counter_index); + return NITIO_LOADA_REG(counter->counter_index); } int ni_tio_winsn(struct ni_gpct *counter, struct comedi_insn *insn, @@ -1710,10 +1710,10 @@ int ni_tio_winsn(struct ni_gpct *counter, struct comedi_insn *insn, write_register(counter, counter_dev->regs[load_reg], load_reg); break; case 1: - counter_dev->regs[NITIO_Gi_LoadA_Reg(counter->counter_index)] = + counter_dev->regs[NITIO_LOADA_REG(counter->counter_index)] = data[0]; write_register(counter, data[0], - NITIO_Gi_LoadA_Reg(counter->counter_index)); + NITIO_LOADA_REG(counter->counter_index)); break; case 2: counter_dev->regs[NITIO_Gi_LoadB_Reg(counter->counter_index)] = diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index 1f7cc423b457..1df787054bf9 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h @@ -25,6 +25,7 @@ #define NITIO_CMD_REG(x) (NITIO_G0_CMD + (x)) #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)) static inline enum ni_gpct_register NITIO_Gi_Counting_Mode_Reg(unsigned idx) { @@ -108,21 +109,6 @@ static inline enum ni_gpct_register NITIO_Gxx_Status_Reg(unsigned idx) return 0; } -static inline enum ni_gpct_register NITIO_Gi_LoadA_Reg(unsigned idx) -{ - switch (idx) { - case 0: - return NITIO_G0_LOADA; - case 1: - return NITIO_G1_LOADA; - case 2: - return NITIO_G2_LOADA; - case 3: - return NITIO_G3_LOADA; - } - return 0; -} - static inline enum ni_gpct_register NITIO_Gi_LoadB_Reg(unsigned idx) { switch (idx) { |