UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_tio_internal.h: replace NITIO_Gi_Autoincrement_Reg() 

The "AutoIncrement" 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:34 -07:00 committed by Greg Kroah-Hartman
parent 12375292ce
commit e062f51b79
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,12 +372,12 @@ void ni_tio_init_counter(struct ni_gpct *counter)
ni_tio_reset_count_and_disarm(counter);
/* initialize counter registers */
counter_dev->regs[NITIO_Gi_Autoincrement_Reg(counter->counter_index)] =
counter_dev->regs[NITIO_AUTO_INC_REG(counter->counter_index)] =
0x0;
write_register(counter,
counter_dev->
regs[NITIO_Gi_Autoincrement_Reg(counter->counter_index)],
NITIO_Gi_Autoincrement_Reg(counter->counter_index));
regs[NITIO_AUTO_INC_REG(counter->counter_index)],
NITIO_AUTO_INC_REG(counter->counter_index));
ni_tio_set_bits(counter, NITIO_Gi_Command_Reg(counter->counter_index),
~0, Gi_Synchronize_Gate_Bit);
ni_tio_set_bits(counter, NITIO_Gi_Mode_Reg(counter->counter_index), ~0,

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

@ -21,20 +21,7 @@
#include "ni_tio.h"
static inline enum ni_gpct_register NITIO_Gi_Autoincrement_Reg(unsigned idx)
{
switch (idx) {
case 0:
return NITIO_G0_AUTO_INC;
case 1:
return NITIO_G1_AUTO_INC;
case 2:
return NITIO_G2_AUTO_INC;
case 3:
return NITIO_G3_AUTO_INC;
}
return 0;
}
#define NITIO_AUTO_INC_REG(x) (NITIO_G0_AUTO_INC + (x))
static inline enum ni_gpct_register NITIO_Gi_Command_Reg(unsigned idx)
{