From ed9feac3e2128aa8c5d7bea593d05d4c6cb8c23c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 1 Nov 2012 17:27:33 -0700 Subject: [PATCH] --- yaml --- r: 337607 b: refs/heads/master c: d8b29d6aa677ec0c3428d8d61a59c2bc61290eb7 h: refs/heads/master i: 337605: b904348b3edd649ee641147ede4ea3130d0bf140 337603: 9a4d2c12508e49bce86f42b416f8b9a675f0375c 337599: 3c43b8e66c7d378c08f5144a7f15cd821b7d9b0a v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/addi_apci_3120.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ee477c55dd98..d7ab293ab00f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f1ff0a38a18fd21696df8b1c1307265aa9db6ae +refs/heads/master: d8b29d6aa677ec0c3428d8d61a59c2bc61290eb7 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c index 03edcc8dc874..3a1b1e46ffdf 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/trunk/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];