diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-02 04:27:47 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-02 22:23:49 +0400 |
| commit | e0f8f2d26d8ec9cd6597fa119107c5d6d2d0343e (patch) | |
| tree | 9590684910a61a40fce13430edaaf388e08c4659 /drivers | |
| parent | d8b29d6aa677ec0c3428d8d61a59c2bc61290eb7 (diff) | |
| download | linux-e0f8f2d26d8ec9cd6597fa119107c5d6d2d0343e.tar.xz | |
The two boards supported by this driver use the same functions for
the comedi operations. Remove this data from the boardinfo to clarify
the subdevice init.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 3a1b1e46ffdf..b0b91e51c2fa 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -40,8 +40,6 @@ static const struct addi_board apci3120_boardtypes[] = { .ai_cmd = i_APCI3120_CommandAnalogInput, .ai_cancel = i_APCI3120_StopCyclicAcquisition, .ao_write = i_APCI3120_InsnWriteAnalogOutput, - .di_read = i_APCI3120_InsnReadDigitalInput, - .di_bits = i_APCI3120_InsnBitsDigitalInput, }, { .pc_DriverName = "apci3001", .i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD, @@ -67,8 +65,6 @@ static const struct addi_board apci3120_boardtypes[] = { .ai_cmdtest = i_APCI3120_CommandTestAnalogInput, .ai_cmd = i_APCI3120_CommandAnalogInput, .ai_cancel = i_APCI3120_StopCyclicAcquisition, - .di_read = i_APCI3120_InsnReadDigitalInput, - .di_bits = i_APCI3120_InsnBitsDigitalInput, }, }; @@ -233,10 +229,8 @@ static int apci3120_attach_pci(struct comedi_device *dev, 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; + s->insn_read = i_APCI3120_InsnReadDigitalInput; + s->insn_bits = i_APCI3120_InsnBitsDigitalInput; /* Allocate and Initialise DO Subdevice Structures */ s = &dev->subdevices[3]; |