staging: comedi: rti800: tidy up rti800_do_insn_bits()

To clarify the function a bit, add local variables for the 'mask'
and 'bits', passed by the comedi core, used to update the digital
outputs.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 72bda292645d..4b2ddc04c176 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -265,11 +265,16 @@ static int rti800_di_insn_bits(struct comedi_device *dev,
 
 static int rti800_do_insn_bits(struct comedi_device *dev,
                                struct comedi_subdevice *s,
-                               struct comedi_insn *insn, unsigned int *data)
+                               struct comedi_insn *insn,
+                               unsigned int *data)
 {
-        if (data[0]) {
-                s->state &= ~data[0];
-                s->state |= data[0] & data[1];
+        unsigned int mask = data[0];
+        unsigned int bits = data[1];
+
+        if (mask) {
+                s->state &= ~mask;
+                s->state |= (bits & mask);
+
                 /* Outputs are inverted... */
                 outb(s->state ^ 0xff, dev->iobase + RTI800_DO);
         }