iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2013-12-19 16:31:36 -07:00 committed by Greg Kroah-Hartman
parent e25ef74446
commit 67c68de0f1
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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