---

yaml --- r: 337730 b: refs/heads/master c: 80230c2 h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · d4d3f50 · d4d3f50
1 parent 65bfe7b
commit d4d3f50
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ded30de45e1ea5979396eaa8241e7ee1e57ff3e
+refs/heads/master: 80230c26d26b0ae82f7d9b7786cd22189d7ccf9d
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
@@ -75,42 +75,6 @@ static int apci2200_di_insn_bits(struct comedi_device *dev,
 	return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev,
-|                    struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data)    |
-|				                                                     |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains         |
-|                                          configuration parameters as below |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure                                                           |
-|					  data[0]  :1:Memory on                          |
-|					            0:Memory off                         |
-|										                             |
-|																	 |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
-static int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
-					  unsigned int *data)
-{
-	struct addi_private *devpriv = dev->private;
-
-	devpriv->b_OutputMemoryStatus = data[0];
-	return insn->n;
-}
-
 static int apci2200_do_insn_bits(struct comedi_device *dev,
 				 struct comedi_subdevice *s,
 				 struct comedi_insn *insn,

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -22,7 +22,6 @@ static const struct addi_board apci2200_boardtypes[] = {
 		.i_Timer		= 1,
 		.reset			= i_APCI2200_Reset,
 		.di_bits		= apci2200_di_insn_bits,
-		.do_config		= i_APCI2200_ConfigDigitalOutput,
 		.do_bits		= apci2200_do_insn_bits,
 		.timer_config		= i_APCI2200_ConfigWatchdog,
 		.timer_write		= i_APCI2200_StartStopWriteWatchdog,