diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-10 17:08:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-15 16:56:37 -0700 |
| commit | 5f73c718554a70d27ddcd1f0a62b9731cc35eebd (patch) | |
| tree | e7e83afa7aa4f87c013b82e7a5d513238fdf649d | |
| parent | b0c375a31ca821da57f752d4ded1689182876d02 (diff) | |
| download | linux-5f73c718554a70d27ddcd1f0a62b9731cc35eebd.tar.gz linux-5f73c718554a70d27ddcd1f0a62b9731cc35eebd.tar.bz2 linux-5f73c718554a70d27ddcd1f0a62b9731cc35eebd.zip | |
staging: comedi: rtd520: remove RtdDacFifoPut macro
This macro uses the 'devpriv' macro which relies on a local variable
having a specific name. Plus it's just a wrapper around a simple
'writew'. Remove the macro.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index e7c550f74b3a..8ba7877d5228 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -406,13 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Digital to Analog converter */ -/* Write one data value (sign + 12bit + marker bits) */ -/* Note: matches what DMA would put. Actual value << 3 */ -#define RtdDacFifoPut(dev, n, v) \ - writew((v), devpriv->las1 + (((n) == 0) ? LAS1_DAC1_FIFO : \ - LAS1_DAC2_FIFO)) - /* Start single DAC conversion */ #define RtdDacUpdate(dev, n) \ writew(0, devpriv->las0 + (((n) == 0) ? LAS0_DAC1 : LAS0_DAC2)) @@ -1577,7 +1570,8 @@ static int rtd_ao_winsn(struct comedi_device *dev, chan, range, data[i], val); /* a typical programming sequence */ - RtdDacFifoPut(dev, chan, val); /* put the value in */ + writew(val, devpriv->las1 + + ((chan == 0) ? LAS1_DAC1_FIFO : LAS1_DAC2_FIFO)); RtdDacUpdate(dev, chan); /* trigger the conversion */ devpriv->aoValue[chan] = data[i]; /* save for read back */ |