staging: comedi: addi_apci_3120: remove test for DI subdevice
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 2 Nov 2012 00:26:45 +0000 (17:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Nov 2012 18:23:48 +0000 (11:23 -0700)
The boards supported by this driver all have digital 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>
drivers/staging/comedi/drivers/addi_apci_3120.c

index 5f82f10ba585f9863cb4d5bf9c716431199c9704..3282c54f61165467c4695497d7459789dbf2fc29 100644 (file)
@@ -240,23 +240,21 @@ static int apci3120_attach_pci(struct comedi_device *dev,
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
+
        /*  Allocate and Initialise DI Subdevice Structures */
        s = &dev->subdevices[2];
-       if (this_board->i_NbrDiChannel) {
-               s->type = COMEDI_SUBD_DI;
-               s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
-               s->n_chan = this_board->i_NbrDiChannel;
-               s->maxdata = 1;
-               s->len_chanlist = this_board->i_NbrDiChannel;
-               s->range_table = &range_digital;
-               s->io_bits = 0; /* all bits input */
-               s->insn_config = this_board->di_config;
-               s->insn_read = this_board->di_read;
-               s->insn_write = this_board->di_write;
-               s->insn_bits = this_board->di_bits;
-       } else {
-               s->type = COMEDI_SUBD_UNUSED;
-       }
+       s->type = COMEDI_SUBD_DI;
+       s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
+       s->n_chan = this_board->i_NbrDiChannel;
+       s->maxdata = 1;
+       s->len_chanlist = this_board->i_NbrDiChannel;
+       s->range_table = &range_digital;
+       s->io_bits = 0; /* all bits input */
+       s->insn_config = this_board->di_config;
+       s->insn_read = this_board->di_read;
+       s->insn_write = this_board->di_write;
+       s->insn_bits = this_board->di_bits;
+
        /*  Allocate and Initialise DO Subdevice Structures */
        s = &dev->subdevices[3];
        s->type = COMEDI_SUBD_DO;