---

yaml --- r: 337607 b: refs/heads/master c: d8b29d6 h: refs/heads/master i: 337605: b904348 337603: 9a4d2c1 337599: 3c43b8e v: v3
git-mirror · Nov 2, 2012 · ed9feac · ed9feac
1 parent 2f55455
commit ed9feac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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];