diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-20 03:31:44 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 23:49:32 +0400 |
| commit | fc31c52f4cfb9465ff69df881807ef1cc0730501 (patch) | |
| tree | 3c2f2eab9b200848ca5b1791756172073b3781c2 /drivers/staging/comedi | |
| parent | 96b6175aa32385db609c706f2c78b14ac515e926 (diff) | |
| download | linux-fc31c52f4cfb9465ff69df881807ef1cc0730501.tar.xz | |
staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Reset_Reg()
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@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 | 2 | ||||
| -rw-r--r-- | 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 7da8228f554c..6fcaebd27de9 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 604fa6909f09..f9eb2d0f6cb6 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) { |