OSDN Git Service

staging: comedi: ni_stc.h: tidy up AO_Status_2_Register
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 1 May 2015 21:59:41 +0000 (14:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 May 2015 17:05:14 +0000 (19:05 +0200)
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>
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/comedi/drivers/ni_stc.h

index 7b57937..6b70138 100644 (file)
@@ -414,7 +414,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = {
        [NISTC_AO_STATUS1_REG]          = { 0x106, 2 },
        [NISTC_G01_STATUS_REG]          = { 0x108, 2 },
        [NISTC_AI_STATUS2_REG]          = { 0, 0 }, /* Unknown */
-       [AO_Status_2_Register]          = { 0x10c, 2 },
+       [NISTC_AO_STATUS2_REG]          = { 0x10c, 2 },
        [DIO_Parallel_Input_Register]   = { 0, 0 }, /* Unknown */
        [G_HW_Save_Register(0)]         = { 0x110, 4 },
        [G_HW_Save_Register(1)]         = { 0x114, 4 },
@@ -1475,7 +1475,7 @@ static void handle_b_interrupt(struct comedi_device *dev,
        if (b_status & NISTC_AO_STATUS1_OVERRUN) {
                dev_err(dev->class_dev,
                        "AO FIFO underrun status=0x%04x status2=0x%04x\n",
-                       b_status, ni_stc_readw(dev, AO_Status_2_Register));
+                       b_status, ni_stc_readw(dev, NISTC_AO_STATUS2_REG));
                s->async->events |= COMEDI_CB_OVERFLOW;
        }
 
index 2f72c47..4411f7b 100644 (file)
 
 #define NISTC_AI_STATUS2_REG           5
 
-#define AO_Status_2_Register           6
+#define NISTC_AO_STATUS2_REG           6
 
 #define DIO_Parallel_Input_Register    7