diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-10 16:41:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-13 08:12:22 -0700 |
| commit | cfe43ed9d63ed60c223387871e7c980f851e96f6 (patch) | |
| tree | 18a550dd13ee0ed8c552f284578dfec05041ff72 | |
| parent | 67e50c6ce031ab0e2309478c330655cd9c3b98ec (diff) | |
| download | blackbird-op-linux-cfe43ed9d63ed60c223387871e7c980f851e96f6.tar.gz blackbird-op-linux-cfe43ed9d63ed60c223387871e7c980f851e96f6.zip | |
staging: comedi: rtd520: remove RtdEnableCGT 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
'writel'. 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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 781f0812b2cc..550ebbd4e859 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -406,10 +406,6 @@ struct rtdPrivate { /* Macros to access registers */ -/* Reset channel gain table read and write pointers */ -#define RtdEnableCGT(dev, v) \ - writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE) - /* Write channel gain table entry */ #define RtdWriteCGTable(dev, v) \ writel(v, devpriv->las0+LAS0_CGT_WRITE) @@ -795,13 +791,13 @@ static void rtd_load_channelgain_list(struct comedi_device *dev, int ii; writel(0, devpriv->las0 + LAS0_CGT_CLEAR); - RtdEnableCGT(dev, 1); /* enable table */ + writel(1, devpriv->las0 + LAS0_CGT_ENABLE); for (ii = 0; ii < n_chan; ii++) { RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii], ii)); } } else { /* just use the channel gain latch */ - RtdEnableCGT(dev, 0); /* disable table, enable latch */ + writel(0, devpriv->las0 + LAS0_CGT_ENABLE); RtdWriteCGLatch(dev, rtdConvertChanGain(dev, list[0], 0)); } } |
