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

The two boards supported by this driver use the same functions for

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2012-11-01 17:27:47 -07:00
committed by Greg Kroah-Hartman
parent d8b29d6aa6
commit e0f8f2d26d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,8 +40,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.ai_cmd = i_APCI3120_CommandAnalogInput, .ai_cmd = i_APCI3120_CommandAnalogInput,
.ai_cancel = i_APCI3120_StopCyclicAcquisition, .ai_cancel = i_APCI3120_StopCyclicAcquisition,
.ao_write = i_APCI3120_InsnWriteAnalogOutput, .ao_write = i_APCI3120_InsnWriteAnalogOutput,
.di_read = i_APCI3120_InsnReadDigitalInput,
.di_bits = i_APCI3120_InsnBitsDigitalInput,
}, { }, {
.pc_DriverName = "apci3001", .pc_DriverName = "apci3001",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD, .i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
@@ -67,8 +65,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.ai_cmdtest = i_APCI3120_CommandTestAnalogInput, .ai_cmdtest = i_APCI3120_CommandTestAnalogInput,
.ai_cmd = i_APCI3120_CommandAnalogInput, .ai_cmd = i_APCI3120_CommandAnalogInput,
.ai_cancel = i_APCI3120_StopCyclicAcquisition, .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->len_chanlist = this_board->i_NbrDiChannel;
s->range_table = &range_digital; s->range_table = &range_digital;
s->io_bits = 0; /* all bits input */ s->io_bits = 0; /* all bits input */
s->insn_config = this_board->di_config; s->insn_read = i_APCI3120_InsnReadDigitalInput;
s->insn_read = this_board->di_read; s->insn_bits = i_APCI3120_InsnBitsDigitalInput;
s->insn_write = this_board->di_write;
s->insn_bits = this_board->di_bits;
/* Allocate and Initialise DO Subdevice Structures */ /* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3]; s = &dev->subdevices[3];