Skip to content

Commit

Permalink
staging: comedi: vmk80xx: remove digital input (*insn_read)
Browse files Browse the repository at this point in the history
The comedi core can use the (*insn_bits) function to emulate the
(*insn_read) function. Remove the unnecessary (*insn_read) 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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent a348b72 commit 0f97889
Showing 1 changed file with 0 additions and 47 deletions.
47 changes: 0 additions & 47 deletions drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,52 +704,6 @@ static int vmk80xx_di_insn_bits(struct comedi_device *dev,
return retval;
}

static int vmk80xx_di_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;
unsigned char *rx_buf;
int reg;
int inp;
int n;

n = rudimentary_check(devpriv, DIR_IN);
if (n)
return n;

down(&devpriv->limit_sem);
chan = CR_CHAN(insn->chanspec);

rx_buf = devpriv->usb_rx_buf;

if (devpriv->model == VMK8061_MODEL) {
reg = VMK8061_DI_REG;
devpriv->usb_tx_buf[0] = VMK8061_CMD_RD_DI;
} else {
reg = VMK8055_DI_REG;
}
for (n = 0; n < insn->n; n++) {
if (vmk80xx_read_packet(devpriv))
break;

if (devpriv->model == VMK8055_MODEL)
inp = (((rx_buf[reg] >> 4) & 0x03) |
((rx_buf[reg] << 2) & 0x04) |
((rx_buf[reg] >> 3) & 0x18));
else
inp = rx_buf[reg];

data[n] = (inp >> 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,
Expand Down Expand Up @@ -1150,7 +1104,6 @@ static int vmk80xx_attach_common(struct comedi_device *dev)
s->n_chan = boardinfo->di_nchans;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_read = vmk80xx_di_insn_read;
s->insn_bits = vmk80xx_di_insn_bits;

/* Digital output subdevice */
Expand Down

0 comments on commit 0f97889

Please sign in to comment.