From 3b09302d625499d22a44fff5308621b08dc950ce Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 10 Jul 2012 17:04:58 -0700 Subject: [PATCH] --- yaml --- r: 317929 b: refs/heads/master c: 2b6e6b8042a9f783170b0a15e0550a075381726e h: refs/heads/master i: 317927: ed6edd253a8bb48b32506bc17180c32b105ec28d v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bb0c02883884..5b55022a63b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db1701246d5c553ed440bcb6ee1b00ed6a975829 +refs/heads/master: 2b6e6b8042a9f783170b0a15e0550a075381726e diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index 757cebb8a299..e3a6aa26e858 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/drivers/staging/comedi/drivers/rtd520.c @@ -407,8 +407,6 @@ struct rtdPrivate { /* Macros to access registers */ /* Digital IO */ -#define RtdDio0Read(dev) \ - (readw(devpriv->las0+LAS0_DIO0) & 0xff) #define RtdDio0Write(dev, v) \ writew((v) & 0xff, devpriv->las0+LAS0_DIO0) @@ -1664,7 +1662,7 @@ static int rtd_dio_insn_bits(struct comedi_device *dev, } /* on return, data[1] contains the value of the digital * input lines. */ - data[1] = RtdDio0Read(dev); + data[1] = readw(devpriv->las0 + LAS0_DIO0) & 0xff; /*DPRINTK("rtd520:port_0 wrote: 0x%x read: 0x%x\n", s->state, data[1]); */