From 370995583e97ba56d91b73d6ec149e2463cb3ee7 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 5 Feb 2013 17:28:27 -0700 Subject: [PATCH] --- yaml --- r: 354447 b: refs/heads/master c: 03754bdbb10a8045b2c18cfec8f2272d7df004c6 h: refs/heads/master i: 354445: 35183362af79f24f434100f961901ef458eff744 354443: ae9b6dd7460ca11142f9382028e307bf4d852872 354439: 5424e01507633f9a7cc79eec5fdc39befa365351 354431: ff25604957831662f29fe3b3dfcbd36573a751df v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/vmk80xx.c | 37 ------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/[refs] b/[refs] index 73d3b1242c4e..23c30cade331 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a23a7481ea860096acbc032dcb1159b8864fbf5 +refs/heads/master: 03754bdbb10a8045b2c18cfec8f2272d7df004c6 diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c index 00f5784f0b59..4f32bad0136f 100644 --- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c +++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c @@ -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];