Commit 47bd1ad8 authored Jun 12, 2013 by H Hartley Sweeten Committed by Greg Kroah-Hartman Jun 17, 2013

staging: comedi: addi_apci_3xxx: rename 'i_NbrAiChannel'



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>

parent 8edd4425

drivers/staging/comedi/drivers/addi_apci_3xxx.c

+24 −24

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ enum apci3xxx_boardid {
		struct apci3xxx_boardinfo {
		const char *name;
		int ai_subdev_flags;
		int i_NbrAiChannel;
		int ai_n_chan;
		int i_NbrAiChannelDiff;
		unsigned int ai_maxdata;
		unsigned char ai_conv_units;
		@@ -97,7 +97,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3000_16] = {
		.name = "apci3000-16",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -107,7 +107,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3000_8] = {
		.name = "apci3000-8",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -117,7 +117,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3000_4] = {
		.name = "apci3000-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 4,
		.ai_n_chan = 4,
		.i_NbrAiChannelDiff = 2,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -127,7 +127,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3006_16] = {
		.name = "apci3006-16",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -137,7 +137,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3006_8] = {
		.name = "apci3006-8",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -147,7 +147,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3006_4] = {
		.name = "apci3006-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 4,
		.ai_n_chan = 4,
		.i_NbrAiChannelDiff = 2,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -157,7 +157,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3010_16] = {
		.name = "apci3010-16",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -169,7 +169,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3010_8] = {
		.name = "apci3010-8",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -181,7 +181,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3010_4] = {
		.name = "apci3010-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 4,
		.ai_n_chan = 4,
		.i_NbrAiChannelDiff = 2,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -193,7 +193,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3016_16] = {
		.name = "apci3016-16",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -205,7 +205,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3016_8] = {
		.name = "apci3016-8",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -217,7 +217,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3016_4] = {
		.name = "apci3016-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 4,
		.ai_n_chan = 4,
		.i_NbrAiChannelDiff = 2,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -229,7 +229,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3100_16_4] = {
		.name = "apci3100-16-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -240,7 +240,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3100_8_4] = {
		.name = "apci3100-8-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -251,7 +251,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3106_16_4] = {
		.name = "apci3106-16-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -262,7 +262,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3106_8_4] = {
		.name = "apci3106-8-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -273,7 +273,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3110_16_4] = {
		.name = "apci3110-16-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -286,7 +286,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3110_8_4] = {
		.name = "apci3110-8-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0x0fff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -299,7 +299,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3116_16_4] = {
		.name = "apci3116-16-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 16,
		.ai_n_chan = 16,
		.i_NbrAiChannelDiff = 8,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -312,7 +312,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
		[BOARD_APCI3116_8_4] = {
		.name = "apci3116-8-4",
		.ai_subdev_flags = SDF_COMMON \| SDF_GROUND \| SDF_DIFF,
		.i_NbrAiChannel = 8,
		.ai_n_chan = 8,
		.i_NbrAiChannelDiff = 4,
		.ai_maxdata = 0xffff,
		.ai_conv_units = CONV_UNIT_MS \| CONV_UNIT_US,
		@@ -621,12 +621,12 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,

		/* Allocate and Initialise AI Subdevice Structures */
		s = &dev->subdevices[0];
		if (board->i_NbrAiChannel \|\| board->i_NbrAiChannelDiff) {
		if (board->ai_n_chan \|\| board->i_NbrAiChannelDiff) {
		dev->read_subdev = s;
		s->type = COMEDI_SUBD_AI;
		s->subdev_flags = SDF_READABLE \| board->ai_subdev_flags;
		if (board->i_NbrAiChannel) {
		s->n_chan = board->i_NbrAiChannel;
		if (board->ai_n_chan) {
		s->n_chan = board->ai_n_chan;
		devpriv->b_SingelDiff = 0;
		} else {
		s->n_chan = board->i_NbrAiChannelDiff;