From 6fa6a018bedc4d2639c435f1d1df36e2eafd3555 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Sep 2012 18:52:34 -0700 Subject: [PATCH] --- yaml --- r: 325114 b: refs/heads/master c: bfa6d3b80fe578d6f930107f75b600920d7e74e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci9111.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c24e1715e780..8a0e03023b34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 101e490a2a2a81f41c9e82acba80a537824aa499 +refs/heads/master: bfa6d3b80fe578d6f930107f75b600920d7e74e0 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 3c0b8c1f83dc..71eebe58fbc6 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -1078,20 +1078,12 @@ static int pci9111_ao_insn_read(struct comedi_device *dev, return i; } -/* ------------------------------------------------------------------ */ -/* DIGITAL INPUT OUTPUT SECTION */ -/* ------------------------------------------------------------------ */ - -/* Digital inputs */ - static int pci9111_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, + unsigned int *data) { - unsigned int bits; - - bits = inw(dev->iobase + PCI9111_DIO_REG); - data[1] = bits; + data[1] = inw(dev->iobase + PCI9111_DIO_REG); return insn->n; }