Skip to content

Commit

Permalink
staging: comedi: addi_apci_3120: remove test for AI subdevice
Browse files Browse the repository at this point in the history
The boards supported by this driver all have analog inputs.
Remove the test for it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 2, 2012
1 parent f2c872e commit 50231a9
Showing 1 changed file with 24 additions and 29 deletions.
53 changes: 24 additions & 29 deletions drivers/staging/comedi/drivers/addi_apci_3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,37 +194,32 @@ static int apci3120_attach_pci(struct comedi_device *dev,

/* Allocate and Initialise AI Subdevice Structures */
s = &dev->subdevices[0];
if (this_board->i_NbrAiChannel || (this_board->i_NbrAiChannelDiff)) {
dev->read_subdev = s;
s->type = COMEDI_SUBD_AI;
s->subdev_flags =
SDF_READABLE | SDF_COMMON | SDF_GROUND
| SDF_DIFF;
if (this_board->i_NbrAiChannel) {
s->n_chan = this_board->i_NbrAiChannel;
devpriv->b_SingelDiff = 0;
} else {
s->n_chan = this_board->i_NbrAiChannelDiff;
devpriv->b_SingelDiff = 1;
}
s->maxdata = this_board->i_AiMaxdata;
s->len_chanlist = this_board->i_AiChannelList;
s->range_table = this_board->pr_AiRangelist;

/* Set the initialisation flag */
devpriv->b_AiInitialisation = 1;

s->insn_config = this_board->ai_config;
s->insn_read = this_board->ai_read;
s->insn_write = this_board->ai_write;
s->insn_bits = this_board->ai_bits;
s->do_cmdtest = this_board->ai_cmdtest;
s->do_cmd = this_board->ai_cmd;
s->cancel = this_board->ai_cancel;

dev->read_subdev = s;
s->type = COMEDI_SUBD_AI;
s->subdev_flags =
SDF_READABLE | SDF_COMMON | SDF_GROUND
| SDF_DIFF;
if (this_board->i_NbrAiChannel) {
s->n_chan = this_board->i_NbrAiChannel;
devpriv->b_SingelDiff = 0;
} else {
s->type = COMEDI_SUBD_UNUSED;
s->n_chan = this_board->i_NbrAiChannelDiff;
devpriv->b_SingelDiff = 1;
}
s->maxdata = this_board->i_AiMaxdata;
s->len_chanlist = this_board->i_AiChannelList;
s->range_table = this_board->pr_AiRangelist;

/* Set the initialisation flag */
devpriv->b_AiInitialisation = 1;

s->insn_config = this_board->ai_config;
s->insn_read = this_board->ai_read;
s->insn_write = this_board->ai_write;
s->insn_bits = this_board->ai_bits;
s->do_cmdtest = this_board->ai_cmdtest;
s->do_cmd = this_board->ai_cmd;
s->cancel = this_board->ai_cancel;

/* Allocate and Initialise AO Subdevice Structures */
s = &dev->subdevices[1];
Expand Down

0 comments on commit 50231a9

Please sign in to comment.