diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-19 16:31:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 11:49:32 -0800 |
| commit | ff157abe21e76c0d51065bd93e91051547f5d608 (patch) | |
| tree | fd583092a8026345c7e56dd12d836e73503b3cc8 /drivers/staging/comedi | |
| parent | 8cd3936e974916238a2f7e10c635c63befa5dfe6 (diff) | |
staging: comedi: ni_tio_internal.h: replace NITIO_Gi_ABZ_Reg()
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio_internal.h | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index f3f1fca765a7..8762dc628c27 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -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) { 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) { case NI_GPCT_SOURCE_ENCODER_A: shift = 10; diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index cac996b27137..b256c94efc60 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h @@ -36,17 +36,7 @@ #define NITIO_STATUS2_REG(x) (NITIO_G01_STATUS2 + ((x) / 2)) #define NITIO_DMA_CFG_REG(x) (NITIO_G0_DMA_CFG + (x)) #define NITIO_DMA_STATUS_REG(x) (NITIO_G0_DMA_STATUS + (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; -} +#define NITIO_ABZ_REG(x) (NITIO_G0_ABZ + (x)) static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(unsigned idx) { |