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

The "DMA Status" 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:48 -07:00 committed by Greg Kroah-Hartman
parent 1dd26c2152
commit 8cd3936e97
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,21 +35,7 @@
#define NITIO_STATUS1_REG(x) (NITIO_G01_STATUS1 + ((x) / 2))
#define NITIO_STATUS2_REG(x) (NITIO_G01_STATUS2 + ((x) / 2))
#define NITIO_DMA_CFG_REG(x) (NITIO_G0_DMA_CFG + (x))
static inline enum ni_gpct_register NITIO_Gi_DMA_Status_Reg(unsigned idx)
{
switch (idx) {
case 0:
return NITIO_G0_DMA_STATUS;
case 1:
return NITIO_G1_DMA_STATUS;
case 2:
return NITIO_G2_DMA_STATUS;
case 3:
return NITIO_G3_DMA_STATUS;
}
return 0;
}
#define NITIO_DMA_STATUS_REG(x) (NITIO_G0_DMA_STATUS + (x))
static inline enum ni_gpct_register NITIO_Gi_ABZ_Reg(unsigned idx)
{

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

@ -443,7 +443,7 @@ void ni_tio_handle_interrupt(struct ni_gpct *counter,
case ni_gpct_variant_m_series:
case ni_gpct_variant_660x:
if (read_register(counter,
NITIO_Gi_DMA_Status_Reg
NITIO_DMA_STATUS_REG
(counter->counter_index)) & Gi_DRQ_Error_Bit) {
dev_notice(counter->counter_dev->dev->class_dev,
"%s: Gi_DRQ_Error detected.\n", __func__);