leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: remove i_APCI3120_InsnConfigDigitalOutput()

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:06:07 -07:00 committed by Greg Kroah-Hartman
parent 66511843c5
commit b96450712f
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@ -242,8 +242,6 @@ static const struct comedi_lrange range_apci3120_ao = {
}; };
static unsigned int ui_Temp;
/* FUNCTION DEFINITIONS */ /* FUNCTION DEFINITIONS */
/* /*
@ -2201,35 +2199,6 @@ static int apci3120_di_insn_bits(struct comedi_device *dev,
return insn->n; return insn->n;
} }
/*
* Configure the output memory ON or OFF
*/
static int i_APCI3120_InsnConfigDigitalOutput(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]) {
devpriv->b_OutputMemoryStatus = APCI3120_ENABLE;
} else {
devpriv->b_OutputMemoryStatus = APCI3120_DISABLE;
devpriv->b_DigitalOutputRegister = 0;
}
if (!devpriv->b_OutputMemoryStatus)
ui_Temp = 0;
/* if(!devpriv->b_OutputMemoryStatus ) */
return insn->n;
}
static int apci3120_do_insn_bits(struct comedi_device *dev, static int apci3120_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, struct comedi_insn *insn,

3
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@ -191,9 +191,6 @@ static int apci3120_attach_pci(struct comedi_device *dev,
s->len_chanlist = this_board->i_NbrDoChannel; s->len_chanlist = this_board->i_NbrDoChannel;
s->range_table = &range_digital; s->range_table = &range_digital;
s->io_bits = 0xf; /* all bits output */ s->io_bits = 0xf; /* all bits output */
/* insn_config - for digital output memory */
s->insn_config = i_APCI3120_InsnConfigDigitalOutput;
s->insn_bits = apci3120_do_insn_bits; s->insn_bits = apci3120_do_insn_bits;
/* Allocate and Initialise Timer Subdevice Structures */ /* Allocate and Initialise Timer Subdevice Structures */