Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354447
b: refs/heads/master
c: 03754bd
h: refs/heads/master
i:
  354445: 3518336
  354443: ae9b6dd
  354439: 5424e01
  354431: ff25604
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent 0195422 commit 3709955
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9a23a7481ea860096acbc032dcb1159b8864fbf5
refs/heads/master: 03754bdbb10a8045b2c18cfec8f2272d7df004c6
37 changes: 0 additions & 37 deletions trunk/drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit 3709955

Please sign in to comment.