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

staging: comedi: addi_apci_3xxx: digital output 'maxdata' is always '1'



Digital output subdevices always have a 'maxdata' of '1'. Remove the
'i_DoMaxData' boardinfo and just open code the value.

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 93c0dc28

drivers/staging/comedi/drivers/addi_apci_3xxx.c

+1 −16

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -192,7 +191,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -212,7 +210,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -232,7 +229,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -252,7 +248,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -272,7 +267,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -374,7 +368,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AoMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -397,7 +390,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AoMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -420,7 +412,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AoMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -443,7 +434,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AoMaxdata = 4095,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.i_NbrTTLChannel = 24,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		@@ -463,7 +453,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.b_AvailableConvertUnit = 7,
		.ui_MinAcquisitiontimeNs = 2500,
		.ai_config = i_APCI3XXX_InsnConfigAnalogInput,
		@@ -477,7 +466,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		.ai_config = i_APCI3XXX_InsnConfigAnalogInput,
		@@ -491,7 +479,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		.ai_config = i_APCI3XXX_InsnConfigAnalogInput,
		@@ -505,7 +492,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
		.i_AiMaxdata = 65535,
		.i_NbrDiChannel = 4,
		.i_NbrDoChannel = 4,
		.i_DoMaxdata = 1,
		.b_AvailableConvertUnit = 6,
		.ui_MinAcquisitiontimeNs = 5000,
		.ai_config = i_APCI3XXX_InsnConfigAnalogInput,
		@@ -662,7 +648,6 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
		devpriv->s_EeParameters.i_AoMaxdata = board->i_AoMaxdata;
		devpriv->s_EeParameters.i_NbrDiChannel = board->i_NbrDiChannel;
		devpriv->s_EeParameters.i_NbrDoChannel = board->i_NbrDoChannel;
		devpriv->s_EeParameters.i_DoMaxdata = board->i_DoMaxdata;
		devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
		board->ui_MinAcquisitiontimeNs;
		devpriv->s_EeParameters.ui_MinDelaytimeNs = board->ui_MinDelaytimeNs;
		@@ -750,7 +735,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
		s->subdev_flags =
		SDF_READABLE \| SDF_WRITEABLE \| SDF_GROUND \| SDF_COMMON;
		s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
		s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
		s->maxdata = 1;
		s->len_chanlist = devpriv->s_EeParameters.i_NbrDoChannel;
		s->range_table = &range_digital;
		s->io_bits = 0xf; /* all bits output */