Skip to content

Commit

Permalink
staging: comedi: addi_apci_3120: clarify DO subdevice init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 2, 2012
1 parent 8f1ff0a commit d8b29d6
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions drivers/staging/comedi/drivers/addi_apci_3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.ao_write = i_APCI3120_InsnWriteAnalogOutput,
.di_read = i_APCI3120_InsnReadDigitalInput,
.di_bits = i_APCI3120_InsnBitsDigitalInput,
.do_config = i_APCI3120_InsnConfigDigitalOutput,
.do_write = i_APCI3120_InsnWriteDigitalOutput,
.do_bits = i_APCI3120_InsnBitsDigitalOutput,
}, {
.pc_DriverName = "apci3001",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
Expand Down Expand Up @@ -72,9 +69,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.ai_cancel = i_APCI3120_StopCyclicAcquisition,
.di_read = i_APCI3120_InsnReadDigitalInput,
.di_bits = i_APCI3120_InsnBitsDigitalInput,
.do_config = i_APCI3120_InsnConfigDigitalOutput,
.do_write = i_APCI3120_InsnWriteDigitalOutput,
.do_bits = i_APCI3120_InsnBitsDigitalOutput,
},
};

Expand Down Expand Up @@ -256,10 +250,9 @@ static int apci3120_attach_pci(struct comedi_device *dev,
s->io_bits = 0xf; /* all bits output */

/* insn_config - for digital output memory */
s->insn_config = this_board->do_config;
s->insn_write = this_board->do_write;
s->insn_bits = this_board->do_bits;
s->insn_read = this_board->do_read;
s->insn_config = i_APCI3120_InsnConfigDigitalOutput;
s->insn_write = i_APCI3120_InsnWriteDigitalOutput;
s->insn_bits = i_APCI3120_InsnBitsDigitalOutput;

/* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[4];
Expand Down

0 comments on commit d8b29d6

Please sign in to comment.