Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: addi_apci_3200: remove i_APCI3200_ConfigDigitalOutput()

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2012-11-06 10:04:09 -07:00 committed by Greg Kroah-Hartman
parent 2e7be560b7
commit e9840e632a
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View file

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

2
drivers/staging/comedi/drivers/addi_apci_3200.c
View file

@ -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,
},
};