---

yaml --- r: 337608 b: refs/heads/master c: e0f8f2d h: refs/heads/master v: v3
git-mirror · Nov 2, 2012 · 103a4b3 · 103a4b3
1 parent ed9feac
commit 103a4b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8b29d6aa677ec0c3428d8d61a59c2bc61290eb7
+refs/heads/master: e0f8f2d26d8ec9cd6597fa119107c5d6d2d0343e
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -40,8 +40,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.ai_cmd			= i_APCI3120_CommandAnalogInput,
 		.ai_cancel		= i_APCI3120_StopCyclicAcquisition,
 		.ao_write		= i_APCI3120_InsnWriteAnalogOutput,
-		.di_read		= i_APCI3120_InsnReadDigitalInput,
-		.di_bits		= i_APCI3120_InsnBitsDigitalInput,
 	}, {
 		.pc_DriverName		= "apci3001",
 		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
@@ -67,8 +65,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.ai_cmdtest		= i_APCI3120_CommandTestAnalogInput,
 		.ai_cmd			= i_APCI3120_CommandAnalogInput,
 		.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->range_table = &range_digital;
 	s->io_bits = 0;	/* all bits input */
-	s->insn_config = this_board->di_config;
-	s->insn_read = this_board->di_read;
-	s->insn_write = this_board->di_write;
-	s->insn_bits = this_board->di_bits;
+	s->insn_read = i_APCI3120_InsnReadDigitalInput;
+	s->insn_bits = i_APCI3120_InsnBitsDigitalInput;
 
 	/*  Allocate and Initialise DO Subdevice Structures */
 	s = &dev->subdevices[3];