diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-06-12 23:09:07 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 21:33:39 (GMT) |
| commit | 56e18770ae2991d315c4e164fab47171fc74c96a (patch) | |
| tree | a50fb334ff139ebaa54a55e90c39242b0449c7d5 /drivers/staging/comedi | |
| parent | 93c0dc284dff2e2fec320662d8ef01b933096e36 (diff) | |
| download | linux-fsl-qoriq-56e18770ae2991d315c4e164fab47171fc74c96a.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3xxx.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index 8ba0d70..7897a51 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -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 */ |