staging: comedi: ni_stc.h: tidy up DIO_Serial_Input_Register

Rename the CamelCase.

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>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 9051477f7ac6ae86ef4771bb04e5b5b63c47a546..cb4aed174648d0e956d5f75bb540ca71febd924a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -424,7 +424,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = {
        [NISTC_AO_BC_SAVE_REG]          = { 0x124, 4 },
        [NISTC_AO_UC_SAVE_REG]          = { 0x128, 4 },
        [NISTC_STATUS1_REG]             = { 0x136, 2 },
-       [DIO_Serial_Input_Register]     = { 0x009, 1 },
+       [NISTC_DIO_SERIAL_IN_REG]       = { 0x009, 1 },
        [Joint_Status_2_Register]       = { 0x13a, 2 },
        [AI_SI_Save_Registers]          = { 0x180, 4 },
        [AI_SC_Save_Registers]          = { 0x184, 4 },
@@ -3552,7 +3552,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev,
        udelay((devpriv->serial_interval_ns + 999) / 1000);
 
        if (data_in)
-               *data_in = ni_stc_readw(dev, DIO_Serial_Input_Register);
+               *data_in = ni_stc_readw(dev, NISTC_DIO_SERIAL_IN_REG);
 
 Error:
        ni_stc_writew(dev, devpriv->dio_control, NISTC_DIO_CTRL_REG);

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 2d7f342790fa486299a3dce82eae556e9a9adc63..509578c46a646efdc42edaec0f046cbf3ee733d6 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -553,10 +553,11 @@
 #define NISTC_STATUS1_REG              27
 #define NISTC_STATUS1_SERIO_IN_PROG    BIT(12)
 
+#define NISTC_DIO_SERIAL_IN_REG                28
+
 #define AI_SI_Save_Registers           64
 #define AI_SC_Save_Registers           66
 
-#define DIO_Serial_Input_Register       28
 #define Joint_Status_2_Register         29
 enum Joint_Status_2_Bits {
        AO_TMRDACWRs_In_Progress_St = 0x20,