[PATCH 077/107] staging: comedi: ni_stc.h: tidy up DIO_Parallel_Input_Register

[H Hartley Sweeten]

Rename the CamelCase.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_mio_common.c | 7 +++----
 drivers/staging/comedi/drivers/ni_stc.h        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c 
b/drivers/staging/comedi/drivers/ni_mio_common.c
index 6b70138..ea30689 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -415,7 +415,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = 
{
        [NISTC_G01_STATUS_REG]          = { 0x108, 2 },
        [NISTC_AI_STATUS2_REG]          = { 0, 0 }, /* Unknown */
        [NISTC_AO_STATUS2_REG]          = { 0x10c, 2 },
-       [DIO_Parallel_Input_Register]   = { 0, 0 }, /* Unknown */
+       [NISTC_DIO_IN_REG]              = { 0, 0 }, /* Unknown */
        [G_HW_Save_Register(0)]         = { 0x110, 4 },
        [G_HW_Save_Register(1)]         = { 0x114, 4 },
        [G_Save_Register(0)]            = { 0x118, 4 },
@@ -3264,7 +3264,7 @@ static int ni_dio_insn_bits(struct comedi_device *dev,
                ni_stc_writew(dev, devpriv->dio_output, NISTC_DIO_OUT_REG);
        }
 
-       data[1] = ni_stc_readw(dev, DIO_Parallel_Input_Register);
+       data[1] = ni_stc_readw(dev, NISTC_DIO_IN_REG);
 
        return insn->n;
 }
@@ -3591,8 +3591,7 @@ static int ni_serial_sw_readwrite8(struct comedi_device 
*dev,
                udelay((devpriv->serial_interval_ns + 999) / 2000);
 
                /* Input current bit */
-               if (ni_stc_readw(dev, DIO_Parallel_Input_Register) &
-                   NISTC_DIO_SDIN)
+               if (ni_stc_readw(dev, NISTC_DIO_IN_REG) & NISTC_DIO_SDIN)
                        input |= mask;
        }
 
diff --git a/drivers/staging/comedi/drivers/ni_stc.h 
b/drivers/staging/comedi/drivers/ni_stc.h
index 4411f7b..5be6a950 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -538,7 +538,7 @@
 
 #define NISTC_AO_STATUS2_REG           6
 
-#define DIO_Parallel_Input_Register    7
+#define NISTC_DIO_IN_REG               7
 
 #define AI_SI_Save_Registers           64
 #define AI_SC_Save_Registers           66
-- 
2.3.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel