staging: comedi: addi_apci_3xxx: rename boardinfo 'i_AiMaxData'

Rename this CamelCase boardinfo. Also, change its type to match
the type of comedi_subdevice 'maxdata'.

For aesthetic reasons, change the values to hex since this is more
common for the 'maxdata' values in comedi drivers.

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>

1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 7cee7a96a27d..7450e6a4f475 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -79,7 +79,7 @@ struct apci3xxx_boardinfo {
 	const char *name;
 	int i_NbrAiChannel;
 	int i_NbrAiChannelDiff;
-	int i_AiMaxdata;
+	unsigned int ai_maxdata;
 	unsigned char b_AvailableConvertUnit;
 	unsigned int ui_MinAcquisitiontimeNs;
 	unsigned int has_ao:1;
@@ -93,7 +93,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3000-16",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ttl_io		= 1,
@@ -102,7 +102,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3000-8",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ttl_io		= 1,
@@ -111,7 +111,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3000-4",
 		.i_NbrAiChannel		= 4,
 		.i_NbrAiChannelDiff	= 2,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ttl_io		= 1,
@@ -120,7 +120,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3006-16",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ttl_io		= 1,
@@ -129,7 +129,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3006-8",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ttl_io		= 1,
@@ -138,7 +138,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3006-4",
 		.i_NbrAiChannel		= 4,
 		.i_NbrAiChannelDiff	= 2,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ttl_io		= 1,
@@ -147,7 +147,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3010-16",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -158,7 +158,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3010-8",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -169,7 +169,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3010-4",
 		.i_NbrAiChannel		= 4,
 		.i_NbrAiChannelDiff	= 2,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -180,7 +180,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3016-16",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -191,7 +191,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3016-8",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -202,7 +202,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3016-4",
 		.i_NbrAiChannel		= 4,
 		.i_NbrAiChannelDiff	= 2,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -213,7 +213,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3100-16-4",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ao			= 1,
@@ -223,7 +223,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3100-8-4",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ao			= 1,
@@ -233,7 +233,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3106-16-4",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ao			= 1,
@@ -243,7 +243,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3106-8-4",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.has_ao			= 1,
@@ -253,7 +253,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3110-16-4",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_ao			= 1,
@@ -265,7 +265,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3110-8-4",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 4095,
+		.ai_maxdata		= 0x0fff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_ao			= 1,
@@ -277,7 +277,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3116-16-4",
 		.i_NbrAiChannel		= 16,
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_ao			= 1,
@@ -289,7 +289,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 		.name			= "apci3116-8-4",
 		.i_NbrAiChannel		= 8,
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_ao			= 1,
@@ -300,7 +300,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 	[BOARD_APCI3003] = {
 		.name			= "apci3003",
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 7,
 		.ui_MinAcquisitiontimeNs = 2500,
 		.has_dig_in		= 1,
@@ -309,7 +309,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 	[BOARD_APCI3002_16] = {
 		.name			= "apci3002-16",
 		.i_NbrAiChannelDiff	= 16,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -318,7 +318,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 	[BOARD_APCI3002_8] = {
 		.name			= "apci3002-8",
 		.i_NbrAiChannelDiff	= 8,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -327,7 +327,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
 	[BOARD_APCI3002_4] = {
 		.name			= "apci3002-4",
 		.i_NbrAiChannelDiff	= 4,
-		.i_AiMaxdata		= 65535,
+		.ai_maxdata		= 0xffff,
 		.b_AvailableConvertUnit	= 6,
 		.ui_MinAcquisitiontimeNs = 5000,
 		.has_dig_in		= 1,
@@ -603,7 +603,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
 			s->n_chan = board->i_NbrAiChannelDiff;
 			devpriv->b_SingelDiff = 1;
 		}
-		s->maxdata = board->i_AiMaxdata;
+		s->maxdata = board->ai_maxdata;
 		s->len_chanlist = s->n_chan;
 		s->range_table = &apci3xxx_ai_range;