diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-19 16:31:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 11:49:31 -0800 |
| commit | 67c68de0f13d17433b40d12ba1a8a36e4e2a0270 (patch) | |
| tree | 0635edb3b9751a5d1bcde217579deeac0f6c7d0b /drivers | |
| parent | e25ef744460ca114c9f4cd5178932135c760f456 (diff) | |
staging: comedi: ni_tio_internal.h: replace NITIO_Gi_SW_Save_Reg()
The "SW Save" 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')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 7 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio_internal.h | 16 |
2 files changed, 4 insertions, 19 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index d535bbbb15f..38ad82333cd 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -1648,15 +1648,14 @@ int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn, a third read will be correct since the count value will definitely have latched by then. */ first_read = read_register(counter, - NITIO_Gi_SW_Save_Reg(counter->counter_index)); + NITIO_SW_SAVE_REG(counter->counter_index)); second_read = read_register(counter, - NITIO_Gi_SW_Save_Reg(counter->counter_index)); + NITIO_SW_SAVE_REG(counter->counter_index)); if (first_read != second_read) correct_read = read_register(counter, - NITIO_Gi_SW_Save_Reg(counter-> - counter_index)); + NITIO_SW_SAVE_REG(counter->counter_index)); else correct_read = first_read; data[0] = correct_read; diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index 9587b877c11..cda3875db0b 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h @@ -23,6 +23,7 @@ #define NITIO_AUTO_INC_REG(x) (NITIO_G0_AUTO_INC + (x)) #define NITIO_CMD_REG(x) (NITIO_G0_CMD + (x)) +#define NITIO_SW_SAVE_REG(x) (NITIO_G0_SW_SAVE + (x)) static inline enum ni_gpct_register NITIO_Gi_Counting_Mode_Reg(unsigned idx) { @@ -151,21 +152,6 @@ static inline enum ni_gpct_register NITIO_Gi_Mode_Reg(unsigned idx) return 0; } -static inline enum ni_gpct_register NITIO_Gi_SW_Save_Reg(int idx) -{ - switch (idx) { - case 0: - return NITIO_G0_SW_SAVE; - case 1: - return NITIO_G1_SW_SAVE; - case 2: - return NITIO_G2_SW_SAVE; - case 3: - return NITIO_G3_SW_SAVE; - } - return 0; -} - static inline enum ni_gpct_register NITIO_Gi_Second_Gate_Reg(unsigned idx) { switch (idx) { |