staging: comedi: addi_apci_3120: remove test for AI subdevice

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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 3282c54f61165467c4695497d7459789dbf2fc29..9bf2ebab9ea29bf8f26f798de8269693ec32ba7e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -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];