From: H Hartley Sweeten Date: Mon, 25 Aug 2014 23:04:48 +0000 (-0700) Subject: staging: comedi: mf6x4: analog output data does not need extra masking X-Git-Tag: firefly_0821_release~176^2~3121^2~1004 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=496e7cd9b8f4e8cce2075c934f518c31ed94a47c;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/mf6x4.c b/drivers/staging/comedi/drivers/mf6x4.c index 464f4b4745c7..66570558b07e 100644 --- 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; }