From a884115d27438c08d83912ae509f9f940b590703 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 10 Jul 2012 17:08:29 -0700 Subject: [PATCH] --- yaml --- r: 317936 b: refs/heads/master c: b0c375a31ca821da57f752d4ded1689182876d02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 76fa3b299064..56f1e7d203e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6e3da878313562078c7fc434c3c7f646b33f202 +refs/heads/master: b0c375a31ca821da57f752d4ded1689182876d02 diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index b0c5f344c168..e7c550f74b3a 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/drivers/staging/comedi/drivers/rtd520.c @@ -406,9 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -#define RtdDio0CtrlWrite(dev, v) \ - writew((v) & 0xff, devpriv->las0+LAS0_DIO0_CTRL) - /* Digital to Analog converter */ /* Write one data value (sign + 12bit + marker bits) */ /* Note: matches what DMA would put. Actual value << 3 */ @@ -1686,7 +1683,7 @@ static int rtd_dio_insn_config(struct comedi_device *dev, /* TODO support digital match interrupts and strobes */ devpriv->dioStatus = 0x01; /* set direction */ writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS); - RtdDio0CtrlWrite(dev, s->io_bits); /* set direction 1 means Out */ + writew(s->io_bits & 0xff, devpriv->las0 + LAS0_DIO0_CTRL); devpriv->dioStatus = 0x00; /* clear interrupts */ writew(devpriv->dioStatus, devpriv->las0 + LAS0_DIO_STATUS);