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

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

Browse Source 
The "ABZ" 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:49 -07:00 committed by Greg Kroah-Hartman
parent 8cd3936e97
commit ff157abe21
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1296,7 +1296,7 @@ static int ni_tio_set_other_src(struct ni_gpct *counter, unsigned index,
if (counter_dev->variant == ni_gpct_variant_m_series) { if (counter_dev->variant == ni_gpct_variant_m_series) {
unsigned int abz_reg, shift, mask; unsigned int abz_reg, shift, mask;
abz_reg = NITIO_Gi_ABZ_Reg(counter->counter_index); abz_reg = NITIO_ABZ_REG(counter->counter_index);
switch (index) { switch (index) {
case NI_GPCT_SOURCE_ENCODER_A: case NI_GPCT_SOURCE_ENCODER_A:
shift = 10; shift = 10;

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

@ -36,17 +36,7 @@
#define NITIO_STATUS2_REG(x) (NITIO_G01_STATUS2 + ((x) / 2)) #define NITIO_STATUS2_REG(x) (NITIO_G01_STATUS2 + ((x) / 2))
#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))
static inline enum ni_gpct_register NITIO_Gi_ABZ_Reg(unsigned idx)
{
switch (idx) {
case 0:
return NITIO_G0_ABZ;
case 1:
return NITIO_G1_ABZ;
}
return 0;
}
static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(unsigned idx) static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(unsigned idx)
{ {