Commit 95e417ae authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_2016: remove i_APCI2016_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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1bf448e2

drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c

+0 −43
Original line number Diff line number Diff line
@@ -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,

drivers/staging/comedi/drivers/addi_apci_2016.c

+0 −1
Original line number Diff line number Diff line
@@ -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,