staging: comedi: mf6x4: analog output data does not need extra masking

The comedi core validates that all the data values are <= s->maxdata
before calling the (*insn_write) function. The extra masking is not
needed. Remove it.

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>

diff --git a/drivers/staging/comedi/drivers/mf6x4.c b/drivers/staging/comedi/drivers/mf6x4.c
index 464f4b4745c76698b6f8945bb9f9ae4a66a8a7ce..66570558b07e5246c34f52f729170de6630982b1 100644 (file)
--- a/drivers/staging/comedi/drivers/mf6x4.c
+++ b/drivers/staging/comedi/drivers/mf6x4.c
@@ -58,7 +58,6 @@
 #define MF6X4_DA7_R                                    0x2e
 /* Map DAC cahnnel id to real HW-dependent offset value */
 #define MF6X4_DAC_R(x)                                 (0x20 + ((x) * 2))
-#define MF6X4_DA_M                                     0x3fff
 
 /* BAR2 registers */
 #define MF634_GPIOC_R                                  0x68
@@ -182,6 +181,7 @@ static int mf6x4_ao_insn_write(struct comedi_device *dev,
 {
        struct mf6x4_private *devpriv = dev->private;
        unsigned int chan = CR_CHAN(insn->chanspec);
+       unsigned int val = devpriv->ao_readback[chan];
        uint32_t gpioc;
        int i;
 
@@ -191,10 +191,10 @@ static int mf6x4_ao_insn_write(struct comedi_device *dev,
                  devpriv->gpioc_R);
 
        for (i = 0; i < insn->n; i++) {
-               iowrite16(data[i] & MF6X4_DA_M, dev->mmio + MF6X4_DAC_R(chan));
-
-               devpriv->ao_readback[chan] = data[i];
+               val = data[i];
+               iowrite16(val, dev->mmio + MF6X4_DAC_R(chan));
        }
+       devpriv->ao_readback[chan] = val;
 
        return insn->n;
 }