openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2013-12-19 16:31:44 -07:00 committed by Greg Kroah-Hartman
parent 96b6175aa3
commit fc31c52f4c
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/comedi/drivers/ni_tio.c
View File

@ -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)

14
drivers/staging/comedi/drivers/ni_tio_internal.h
View File

@ -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)
{