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_Status2_Reg() 

The shared "Status2" 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:46 -07:00 committed by Greg Kroah-Hartman
parent 450a7c43e8
commit 5f19efaca6
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,19 +33,7 @@
#define NITIO_STATUS_REG(x) (NITIO_G01_STATUS + ((x) / 2))
#define NITIO_RESET_REG(x) (NITIO_G01_RESET + ((x) / 2))
#define NITIO_STATUS1_REG(x) (NITIO_G01_STATUS1 + ((x) / 2))
static inline enum ni_gpct_register NITIO_Gxx_Joint_Status2_Reg(unsigned idx)
{
switch (idx) {
case 0:
case 1:
return NITIO_G01_STATUS2;
case 2:
case 3:
return NITIO_G23_STATUS2;
}
return 0;
}
#define NITIO_STATUS2_REG(x) (NITIO_G01_STATUS2 + ((x) / 2))
static inline enum ni_gpct_register NITIO_Gi_DMA_Config_Reg(unsigned idx)
{

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

@ -408,7 +408,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
*stale_data = 1;
}
if (read_register(counter,
NITIO_Gxx_Joint_Status2_Reg
NITIO_STATUS2_REG
(counter->counter_index)) &
Gi_Permanent_Stale_Bit(counter->counter_index)) {
dev_info(counter->counter_dev->dev->class_dev,