staging: comedi: addi_apci_3120: clarify DO subdevice init

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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 03edcc8dc87406eba976572e903e28d1ee78d734..3a1b1e46ffdf5fef9e366edeba404aad30a93a19 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -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,
@@ -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,
        },
 };
 
@@ -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];