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@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index f9eb2d0..75e6220 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)
{
--
1.8.5.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
