aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2015-05-01 14:59:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-09 19:05:14 +0200
commit3ca18feff7c4259f3f809575fdb26bdc7828a9bd (patch)
tree6f04e9e7d3033a199eefab650c4e846549c1ad59
parentstaging: comedi: ni_stc.h: tidy up G_Status_Register (diff)
staging: comedi: ni_stc.h: tidy up AI_Status_2_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>
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_common.c2
-rw-r--r--drivers/staging/comedi/drivers/ni_stc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index a71a697f2b9b..7b579376f3ba 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -413,7 +413,7 @@ static const struct mio_regmap m_series_stc_read_regmap[] = {
[NISTC_AI_STATUS1_REG] = { 0x104, 2 },
[NISTC_AO_STATUS1_REG] = { 0x106, 2 },
[NISTC_G01_STATUS_REG] = { 0x108, 2 },
- [AI_Status_2_Register] = { 0, 0 }, /* Unknown */
+ [NISTC_AI_STATUS2_REG] = { 0, 0 }, /* Unknown */
[AO_Status_2_Register] = { 0x10c, 2 },
[DIO_Parallel_Input_Register] = { 0, 0 }, /* Unknown */
[G_HW_Save_Register(0)] = { 0x110, 4 },
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 5950bab41c77..2f72c47ef2f6 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -534,7 +534,7 @@
#define NISTC_G01_STATUS_REG 4
-#define AI_Status_2_Register 5
+#define NISTC_AI_STATUS2_REG 5
#define AO_Status_2_Register 6