diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-19 16:31:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 11:49:32 -0800 |
| commit | e72ccb041bc1d068ae216c7fa6513d70c075d440 (patch) | |
| tree | bcc9ebadb02148e51ab06dea9ffd4ba91e6296d4 /drivers | |
| parent | ff157abe21e76c0d51065bd93e91051547f5d608 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio_internal.h | 16 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tiocmd.c | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index b256c94efc60..b5b5822d9355 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h @@ -37,21 +37,7 @@ #define NITIO_DMA_CFG_REG(x) (NITIO_G0_DMA_CFG + (x)) #define NITIO_DMA_STATUS_REG(x) (NITIO_G0_DMA_STATUS + (x)) #define NITIO_ABZ_REG(x) (NITIO_G0_ABZ + (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; -} +#define NITIO_INT_ACK_REG(x) (NITIO_G0_INT_ACK + (x)) static inline enum ni_gpct_register NITIO_Gi_Status_Reg(unsigned idx) { diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c index e43dd17bb45d..4f59f5a06c75 100644 --- a/drivers/staging/comedi/drivers/ni_tiocmd.c +++ b/drivers/staging/comedi/drivers/ni_tiocmd.c @@ -397,7 +397,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error, } if (ack) write_register(counter, ack, - NITIO_Gi_Interrupt_Acknowledge_Reg + NITIO_INT_ACK_REG (counter->counter_index)); if (ni_tio_get_soft_copy (counter, |