---

yaml --- r: 337606 b: refs/heads/master c: 8f1ff0a h: refs/heads/master v: v3
git-mirror · Nov 2, 2012 · 2f55455 · 2f55455
1 parent b904348
commit 2f55455
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: 50231a91efda18612ebe76ed51ff970707756f34
+refs/heads/master: 8f1ff0a38a18fd21696df8b1c1307265aa9db6ae
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -45,9 +45,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.do_config		= i_APCI3120_InsnConfigDigitalOutput,
 		.do_write		= i_APCI3120_InsnWriteDigitalOutput,
 		.do_bits		= i_APCI3120_InsnBitsDigitalOutput,
-		.timer_config		= i_APCI3120_InsnConfigTimer,
-		.timer_write		= i_APCI3120_InsnWriteTimer,
-		.timer_read		= i_APCI3120_InsnReadTimer,
 	}, {
 		.pc_DriverName		= "apci3001",
 		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
@@ -78,9 +75,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.do_config		= i_APCI3120_InsnConfigDigitalOutput,
 		.do_write		= i_APCI3120_InsnWriteDigitalOutput,
 		.do_bits		= i_APCI3120_InsnBitsDigitalOutput,
-		.timer_config		= i_APCI3120_InsnConfigTimer,
-		.timer_write		= i_APCI3120_InsnWriteTimer,
-		.timer_read		= i_APCI3120_InsnReadTimer,
 	},
 };
 
@@ -276,10 +270,9 @@ static int apci3120_attach_pci(struct comedi_device *dev,
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
 
-	s->insn_write = this_board->timer_write;
-	s->insn_read = this_board->timer_read;
-	s->insn_config = this_board->timer_config;
-	s->insn_bits = this_board->timer_bits;
+	s->insn_write = i_APCI3120_InsnWriteTimer;
+	s->insn_read = i_APCI3120_InsnReadTimer;
+	s->insn_config = i_APCI3120_InsnConfigTimer;
 
 	/*  Allocate and Initialise TTL */
 	s = &dev->subdevices[5];