FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-28 16:36:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_1032: board has 32 digital inputs

Browse Source 
This board always has 32 digital inputs. Remove the test when
initializing the subdevice.

Also, since this board is the only one supported by this driver,
remove the boardinfo about the digital inputs and just use the
data directly in the subdevice init.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-11-05 14:36:27 -07:00 committed by Greg Kroah-Hartman
parent 9559ff7e7e
commit 4c2c1488d3
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/comedi/drivers/addi_apci_1032.c
View File

@ -18,9 +18,6 @@ static const struct addi_board apci1032_boardtypes[] = {
.pc_EepromChip = ADDIDATA_93C76, .pc_EepromChip = ADDIDATA_93C76,
.i_NbrDiChannel = 32, .i_NbrDiChannel = 32,
.interrupt = v_APCI1032_Interrupt, .interrupt = v_APCI1032_Interrupt,
.di_config = i_APCI1032_ConfigDigitalInput,
.di_read = i_APCI1032_Read1DigitalInput,
.di_bits = i_APCI1032_ReadMoreDigitalInput,
}, },
}; };
@ -165,22 +162,15 @@ static int apci1032_attach_pci(struct comedi_device *dev,
/* Allocate and Initialise DI Subdevice Structures */ /* Allocate and Initialise DI Subdevice Structures */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
if (devpriv->s_EeParameters.i_NbrDiChannel) { s->type = COMEDI_SUBD_DI;
s->type = COMEDI_SUBD_DI; s->subdev_flags = SDF_READABLE;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON; s->n_chan = 32;
s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel; s->maxdata = 1;
s->maxdata = 1; s->len_chanlist = 32;
s->len_chanlist = s->range_table = &range_digital;
devpriv->s_EeParameters.i_NbrDiChannel; s->insn_config = i_APCI1032_ConfigDigitalInput;
s->range_table = &range_digital; s->insn_read = i_APCI1032_Read1DigitalInput;
s->io_bits = 0; /* all bits input */ s->insn_bits = i_APCI1032_ReadMoreDigitalInput;
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;
}
/* Allocate and Initialise DO Subdevice Structures */ /* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3]; s = &dev->subdevices[3];