aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-22 21:36:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-23 13:41:51 -0400
commite245b6d12691c1e178a6a075ac3cd1b7cd0d2e0e (patch)
tree4848e7dcb2abd71ca1f251ad28f8634dc4421221
parent26234771c1a53b0a3bf69c161d79cd37c77ebd1a (diff)
staging: comedi: das800: tidy up das800_di_insn_bits()
For digital input subdevices, the (*insn_bits) function simply needs to return the status of the input channels in data[1]. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/das800.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 4f6698dc76db..cc4202eb3958 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -632,12 +632,7 @@ static int das800_di_insn_bits(struct comedi_device *dev,
632 struct comedi_insn *insn, 632 struct comedi_insn *insn,
633 unsigned int *data) 633 unsigned int *data)
634{ 634{
635 unsigned int bits; 635 data[1] = (inb(dev->iobase + DAS800_STATUS) >> 4) & 0x7;
636
637 bits = inb(dev->iobase + DAS800_STATUS) >> 4;
638 bits &= 0x7;
639 data[1] = bits;
640 data[0] = 0;
641 636
642 return insn->n; 637 return insn->n;
643} 638}