summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-12-20 03:31:45 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-20 23:49:32 +0400
commit450a7c43e8742a176e451ff2dfc3e22eae839987 (patch)
tree592c4d287fba907c789c0e62318eee7c7bf38803 /drivers/staging/comedi
parentfc31c52f4cfb9465ff69df881807ef1cc0730501 (diff)
downloadlinux-450a7c43e8742a176e451ff2dfc3e22eae839987.tar.xz
staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Status1_Reg()
The shared "Status1" 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_internal.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index f9eb2d0f6cb6..75e622030746 100644
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -32,19 +32,7 @@
#define NITIO_GATE2_REG(x) (NITIO_G0_GATE2 + (x))
#define NITIO_STATUS_REG(x) (NITIO_G01_STATUS + ((x) / 2))
#define NITIO_RESET_REG(x) (NITIO_G01_RESET + ((x) / 2))
-
-static inline enum ni_gpct_register NITIO_Gxx_Joint_Status1_Reg(unsigned idx)
-{
- switch (idx) {
- case 0:
- case 1:
- return NITIO_G01_STATUS1;
- case 2:
- case 3:
- return NITIO_G23_STATUS1;
- }
- return 0;
-}
+#define NITIO_STATUS1_REG(x) (NITIO_G01_STATUS1 + ((x) / 2))
static inline enum ni_gpct_register NITIO_Gxx_Joint_Status2_Reg(unsigned idx)
{