Browse Source

staging: comedi: addi_apci_3120: clarify AI subdevice init

The two boards supported by this driver use the same functions for
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>
H Hartley Sweeten 12 years ago
parent
commit
2a8796d65c
1 changed files with 5 additions and 17 deletions
  1. 5 17
      drivers/staging/comedi/drivers/addi_apci_3120.c

+ 5 - 17
drivers/staging/comedi/drivers/addi_apci_3120.c

@@ -34,11 +34,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.ui_MinDelaytimeNs	= 100000,
 		.interrupt		= v_APCI3120_Interrupt,
 		.reset			= i_APCI3120_Reset,
-		.ai_config		= i_APCI3120_InsnConfigAnalogInput,
-		.ai_read		= i_APCI3120_InsnReadAnalogInput,
-		.ai_cmdtest		= i_APCI3120_CommandTestAnalogInput,
-		.ai_cmd			= i_APCI3120_CommandAnalogInput,
-		.ai_cancel		= i_APCI3120_StopCyclicAcquisition,
 		.ao_write		= i_APCI3120_InsnWriteAnalogOutput,
 	}, {
 		.pc_DriverName		= "apci3001",
@@ -60,11 +55,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.ui_MinDelaytimeNs	= 100000,
 		.interrupt		= v_APCI3120_Interrupt,
 		.reset			= i_APCI3120_Reset,
-		.ai_config		= i_APCI3120_InsnConfigAnalogInput,
-		.ai_read		= i_APCI3120_InsnReadAnalogInput,
-		.ai_cmdtest		= i_APCI3120_CommandTestAnalogInput,
-		.ai_cmd			= i_APCI3120_CommandAnalogInput,
-		.ai_cancel		= i_APCI3120_StopCyclicAcquisition,
 	},
 };
 
@@ -197,13 +187,11 @@ static int apci3120_attach_pci(struct comedi_device *dev,
 	/* Set the initialisation flag */
 	devpriv->b_AiInitialisation = 1;
 
-	s->insn_config = this_board->ai_config;
-	s->insn_read = this_board->ai_read;
-	s->insn_write = this_board->ai_write;
-	s->insn_bits = this_board->ai_bits;
-	s->do_cmdtest = this_board->ai_cmdtest;
-	s->do_cmd = this_board->ai_cmd;
-	s->cancel = this_board->ai_cancel;
+	s->insn_config = i_APCI3120_InsnConfigAnalogInput;
+	s->insn_read = i_APCI3120_InsnReadAnalogInput;
+	s->do_cmdtest = i_APCI3120_CommandTestAnalogInput;
+	s->do_cmd = i_APCI3120_CommandAnalogInput;
+	s->cancel = i_APCI3120_StopCyclicAcquisition;
 
 	/*  Allocate and Initialise AO Subdevice Structures */
 	s = &dev->subdevices[1];