---

yaml --- r: 337733 b: refs/heads/master c: 95e417a h: refs/heads/master i: 337731: 0254e8c v: v3
git-mirror · Nov 13, 2012 · 7a2e4b2 · 7a2e4b2
1 parent 9edbd02
commit 7a2e4b2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 45 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bf448e27814a5caa8ab0ad8ba2a54af7469cee6
+refs/heads/master: 95e417aea4c954846f0f07e1b1b2e22267255aa5
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
@@ -63,49 +63,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI2016_WATCHDOG_RELOAD_VALUE	4
 #define APCI2016_WATCHDOG_STATUS	16
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2016_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 |
-|                                                                            |
-|			  data[0]            : 1 Digital Memory On               |
-|				     			   0 Digital Memory Off              |
-+----------------------------------------------------------------------------+
-| Output Parameters :	--													 |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|		            : FALSE : Error occur. Return the error          |
-|			                                                         |
-+----------------------------------------------------------------------------+
-*/
-static int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
-					  unsigned int *data)
-{
-	struct addi_private *devpriv = dev->private;
-
-	if ((data[0] != 0) && (data[0] != 1)) {
-		comedi_error(dev,
-			"Not a valid Data !!! ,Data should be 1 or 0\n");
-		return -EINVAL;
-	}			/*  if  ((data[0]!=0) && (data[0]!=1)) */
-	if (data[0]) {
-		devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
-	}			/*  if  (data[0] */
-	else {
-		devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
-	}			/*  else if  (data[0] */
-	return insn->n;
-}
-
 static int apci2016_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_2016.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2016.c
@@ -21,7 +21,6 @@ static const struct addi_board apci2016_boardtypes[] = {
 		.i_NbrDoChannel		= 16,
 		.i_Timer		= 1,
 		.reset			= i_APCI2016_Reset,
-		.do_config		= i_APCI2016_ConfigDigitalOutput,
 		.do_bits		= apci2016_do_insn_bits,
 		.timer_config		= i_APCI2016_ConfigWatchdog,
 		.timer_write		= i_APCI2016_StartStopWriteWatchdog,