Browse Source

staging: comedi: addi_apci_3120: clarify timer 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
8f1ff0a38a
1 changed files with 3 additions and 10 deletions
  1. 3 10
      drivers/staging/comedi/drivers/addi_apci_3120.c

+ 3 - 10
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];