hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

The "Interrupt Acknowledge" 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:50 -07:00 committed by Greg Kroah-Hartman
parent ff157abe21
commit e72ccb041b
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

@ -37,21 +37,7 @@
#define NITIO_DMA_CFG_REG(x) (NITIO_G0_DMA_CFG + (x)) #define NITIO_DMA_CFG_REG(x) (NITIO_G0_DMA_CFG + (x))
#define NITIO_DMA_STATUS_REG(x) (NITIO_G0_DMA_STATUS + (x)) #define NITIO_DMA_STATUS_REG(x) (NITIO_G0_DMA_STATUS + (x))
#define NITIO_ABZ_REG(x) (NITIO_G0_ABZ + (x)) #define NITIO_ABZ_REG(x) (NITIO_G0_ABZ + (x))
#define NITIO_INT_ACK_REG(x) (NITIO_G0_INT_ACK + (x))
static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(unsigned idx)
{
switch (idx) {
case 0:
return NITIO_G0_INT_ACK;
case 1:
return NITIO_G1_INT_ACK;
case 2:
return NITIO_G2_INT_ACK;
case 3:
return NITIO_G3_INT_ACK;
}
return 0;
}
static inline enum ni_gpct_register NITIO_Gi_Status_Reg(unsigned idx) static inline enum ni_gpct_register NITIO_Gi_Status_Reg(unsigned idx)
{ {

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

@ -397,7 +397,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
} }
if (ack) if (ack)
write_register(counter, ack, write_register(counter, ack,
NITIO_Gi_Interrupt_Acknowledge_Reg NITIO_INT_ACK_REG
(counter->counter_index)); (counter->counter_index));
if (ni_tio_get_soft_copy if (ni_tio_get_soft_copy
(counter, (counter,