mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

staging: comedi: vmk80xx: remove digital output (*insn_read)

Browse source 
The comedi core can use the (*insn_bits) function to emulate the
(*insn_read) function.

The digital output (*insn_bits) function properly handles the
VMK8061_MODEL to read the digital output states before returning.

Remove the unnecessary (*insn_read) function. It's also not
necessary to set the SDF_READABLE flag so remove the entire
conditional in the attach.

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 2013-02-05 17:28:27 -07:00 committed by Greg Kroah-Hartman
parent 9a23a7481e
commit 03754bdbb1
1 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/staging/comedi/drivers/vmk80xx.c
View file

@ -799,39 +799,6 @@ static int vmk80xx_do_insn_write(struct comedi_device *dev,
return n;
}
static int vmk80xx_do_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct vmk80xx_private *devpriv = dev->private;
int chan;
int reg;
int n;
n = rudimentary_check(devpriv, DIR_IN);
if (n)
return n;
down(&devpriv->limit_sem);
chan = CR_CHAN(insn->chanspec);
reg = VMK8061_DO_REG;
devpriv->usb_tx_buf[0] = VMK8061_CMD_RD_DO;
for (n = 0; n < insn->n; n++) {
if (vmk80xx_read_packet(devpriv))
break;
data[n] = (devpriv->usb_rx_buf[reg] >> chan) & 1;
}
up(&devpriv->limit_sem);
return n;
}
static int vmk80xx_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
@ -1244,10 +1211,6 @@ static int vmk80xx_attach_common(struct comedi_device *dev)
s->range_table = &range_digital;
s->insn_write = vmk80xx_do_insn_write;
s->insn_bits = vmk80xx_do_insn_bits;
if (devpriv->model == VMK8061_MODEL) {
s->subdev_flags |= SDF_READABLE;
s->insn_read = vmk80xx_do_insn_read;
}
/* Counter subdevice */
s = &dev->subdevices[4];