From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 6 Nov 2012 17:04:09 +0000 (-0700)
Subject: staging: comedi: addi_apci_3200: remove i_APCI3200_ConfigDigitalOutput()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9840e632a2fd22b3af4a2593df49dcc94923e50;p=linux-beck.git

staging: comedi: addi_apci_3200: remove i_APCI3200_ConfigDigitalOutput()

The digital outputs of the board supported by this driver are not
configurable. This driver abuses the comedi API and uses the 'insn_config'
function of the digital output subdevice to enable/disable writing to
the eeprom on the board. Remove this function.

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>
---

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 1c2f26d66b4d..829af187b249 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -621,33 +621,6 @@ static int apci3200_di_insn_bits(struct comedi_device *dev,
 	return insn->n;
 }
 
-/*
- * Configures The Digital Output Subdevice.
- *
- * data[0] = 1  Memory enable
- *	   = 0  Memory Disable
- */
-static int i_APCI3200_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 apci3200_do_insn_bits(struct comedi_device *dev,
 				 struct comedi_subdevice *s,
 				 struct comedi_insn *insn,
diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 890877febaca..ee527a71701d 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -50,7 +50,6 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.ai_cmd			= i_APCI3200_CommandAnalogInput,
 		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
 		.di_bits		= apci3200_di_insn_bits,
-		.do_config		= i_APCI3200_ConfigDigitalOutput,
 		.do_bits		= apci3200_do_insn_bits,
 	}, {
 		.pc_DriverName		= "apci3300",
@@ -80,7 +79,6 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.ai_cmd			= i_APCI3200_CommandAnalogInput,
 		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
 		.di_bits		= apci3200_di_insn_bits,
-		.do_config		= i_APCI3200_ConfigDigitalOutput,
 		.do_bits		= apci3200_do_insn_bits,
 	},
 };