lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: addi_apci_3120: remove test for DI subdevice

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2012-11-01 17:26:45 -07:00
committed by Greg Kroah-Hartman
parent 43deb75dcc
commit f2c872e198
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@@ -240,9 +240,9 @@ static int apci3120_attach_pci(struct comedi_device *dev,
} else { } else {
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
/* Allocate and Initialise DI Subdevice Structures */ /* Allocate and Initialise DI Subdevice Structures */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
if (this_board->i_NbrDiChannel) {
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->i_NbrDiChannel; s->n_chan = this_board->i_NbrDiChannel;
@@ -254,9 +254,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
s->insn_read = this_board->di_read; s->insn_read = this_board->di_read;
s->insn_write = this_board->di_write; s->insn_write = this_board->di_write;
s->insn_bits = this_board->di_bits; s->insn_bits = this_board->di_bits;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DO Subdevice Structures */ /* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3]; s = &dev->subdevices[3];
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;