]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
staging: comedi: addi_apci_1564: board does not have analog inputs
authorChase Southwood <chase.southwood@gmail.com>
Fri, 25 Apr 2014 08:17:06 +0000 (03:17 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2014 22:04:30 +0000 (15:04 -0700)
This board does not have analog inputs.  Remove the subdevice init for
them.

Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi_apci_1564.c

index 792916d230e122386c19fe97abccb7cbbcdeac6d..eee10cc68af107f0fa9e36d7ee2969b081c63daf 100644 (file)
@@ -144,36 +144,7 @@ static int apci1564_auto_attach(struct comedi_device *dev,
 
        /*  Allocate and Initialise AI Subdevice Structures */
        s = &dev->subdevices[0];
-       if ((devpriv->s_EeParameters.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 (devpriv->s_EeParameters.i_NbrAiChannel) {
-                       s->n_chan =
-                               devpriv->s_EeParameters.i_NbrAiChannel;
-                       devpriv->b_SingelDiff = 0;
-               } else {
-                       s->n_chan = this_board->i_NbrAiChannelDiff;
-                       devpriv->b_SingelDiff = 1;
-               }
-               s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
-               s->len_chanlist = this_board->i_AiChannelList;
-               s->range_table = this_board->pr_AiRangelist;
-
-               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;
-
-       } else {
-               s->type = COMEDI_SUBD_UNUSED;
-       }
+       s->type = COMEDI_SUBD_UNUSED;
 
        /*  Allocate and Initialise AO Subdevice Structures */
        s = &dev->subdevices[1];