summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-06-12 16:20:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 14:33:55 -0700
commit8edd44251eb35b92f381b8caf495f6cc8483bc27 (patch)
tree9a94deae0895675d64877757e101d75c16851a20 /drivers/staging/comedi
parenta67e0cc7aa3f15a4aa3e88945cd1d2476149191f (diff)
staging: comedi: addi_apci_3xxx: rename 'ui_MinAcquisitiontimeNs'
Rename this CamelCase boardinfo variable. 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>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c2
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_3xxx.c50
2 files changed, 26 insertions, 26 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index edb91849881a..ce4c41fb5ef7 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -71,7 +71,7 @@ static int apci3xxx_ai_configure(struct comedi_device *dev,
}
/* Test the convert time value */
- if (acq_ns < board->ui_MinAcquisitiontimeNs)
+ if (acq_ns < board->ai_min_acq_ns)
return -EINVAL;
/* Test if conversion not started */
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 8deec2b0734f..3f9ddb4f1d44 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -86,7 +86,7 @@ struct apci3xxx_boardinfo {
int i_NbrAiChannelDiff;
unsigned int ai_maxdata;
unsigned char ai_conv_units;
- unsigned int ui_MinAcquisitiontimeNs;
+ unsigned int ai_min_acq_ns;
unsigned int has_ao:1;
unsigned int has_dig_in:1;
unsigned int has_dig_out:1;
@@ -101,7 +101,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3000_8] = {
@@ -111,7 +111,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3000_4] = {
@@ -121,7 +121,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3006_16] = {
@@ -131,7 +131,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3006_8] = {
@@ -141,7 +141,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3006_4] = {
@@ -151,7 +151,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3010_16] = {
@@ -161,7 +161,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
@@ -173,7 +173,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
@@ -185,7 +185,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
@@ -197,7 +197,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
@@ -209,7 +209,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
@@ -221,7 +221,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
@@ -233,7 +233,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
@@ -244,7 +244,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
@@ -255,7 +255,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
@@ -266,7 +266,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 10000,
+ .ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
@@ -277,7 +277,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
@@ -290,7 +290,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
@@ -303,7 +303,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
@@ -316,7 +316,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
@@ -329,7 +329,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US |
CONV_UNIT_NS,
- .ui_MinAcquisitiontimeNs = 2500,
+ .ai_min_acq_ns = 2500,
.has_dig_in = 1,
.has_dig_out = 1,
},
@@ -339,7 +339,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 16,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
},
@@ -349,7 +349,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
},
@@ -359,7 +359,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
- .ui_MinAcquisitiontimeNs = 5000,
+ .ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 01:30:01 +0000