aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/mf6x4.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2015-10-06 11:11:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-12 22:55:31 -0700
commit418c971364cb6eb3cc94b9e4ec1ae6bf3fc98dc7 (patch)
tree820ced8d94654404b58f733578e0c58070865a3d /drivers/staging/comedi/drivers/mf6x4.c
parentstaging: comedi: mf6x4: A/D converter uses 2's complement coding (diff)
downloadlinux-dev-418c971364cb6eb3cc94b9e4ec1ae6bf3fc98dc7.tar.xz
linux-dev-418c971364cb6eb3cc94b9e4ec1ae6bf3fc98dc7.zip
staging: comedi: mf6x4: remove unnecassary masking of digital outputs
THe 's->state' will always be in range for the 8 digital outputs. Remove the unnecessary masking of the value. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> drivers/staging/comedi/drivers/mf6x4.c | 6 +++--- Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/mf6x4.c')
-rw-r--r--drivers/staging/comedi/drivers/mf6x4.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/mf6x4.c b/drivers/staging/comedi/drivers/mf6x4.c
index 1e4f08058723..03f81e948b95 100644
--- a/drivers/staging/comedi/drivers/mf6x4.c
+++ b/drivers/staging/comedi/drivers/mf6x4.c
@@ -43,8 +43,7 @@
#define MF6X4_ADCTRL_CHAN(x) BIT(chan)
#define MF6X4_DIN_R 0x10
#define MF6X4_DIN_M 0xff
-#define MF6X4_DOUT_R 0x10
-#define MF6X4_DOUT_M 0xff
+#define MF6X4_DOUT_REG 0x10
#define MF6X4_ADSTART_R 0x20
#define MF6X4_DAC_R(x) (0x20 + ((x) * 2))
@@ -107,7 +106,7 @@ static int mf6x4_do_insn_bits(struct comedi_device *dev,
unsigned int *data)
{
if (comedi_dio_update_state(s, data))
- iowrite16(s->state & MF6X4_DOUT_M, dev->mmio + MF6X4_DOUT_R);
+ iowrite16(s->state, dev->mmio + MF6X4_DOUT_REG);
data[1] = s->state;