staging: comedi: das16m1: tidy up das16m1_di_insn_bits()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 3 May 2016 19:29:54 +0000 (12:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 18 Jun 2016 03:42:21 +0000 (20:42 -0700)
The (*insn_bits) for a digital input subdevice only needs to return the
state of the inputs in data[1]. Remove the cruft.

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>
drivers/staging/comedi/drivers/das16m1.c

index f51da809df05d02a49345bccaaef4261485a1ef4..538544b4ed1cf2434d2242a4ef0d6d4176a2993d 100644 (file)
@@ -352,11 +352,7 @@ static int das16m1_di_insn_bits(struct comedi_device *dev,
                                struct comedi_insn *insn,
                                unsigned int *data)
 {
-       unsigned int bits;
-
-       bits = inb(dev->iobase + DAS16M1_DI_REG) & 0xf;
-       data[1] = bits;
-       data[0] = 0;
+       data[1] = inb(dev->iobase + DAS16M1_DI_REG) & 0xf;
 
        return insn->n;
 }