leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: rtd520: remove RtdClearCGT macro

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-07-10 16:40:55 -07:00 committed by Greg Kroah-Hartman
parent a8cb975ffe
commit 67e50c6ce0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/drivers/rtd520.c
View File

@ -406,10 +406,6 @@ struct rtdPrivate {
/* Macros to access registers */
/* Reset channel gain table read and write pointers */
#define RtdClearCGT(dev) \
writel(0, devpriv->las0+LAS0_CGT_CLEAR)
/* Reset channel gain table read and write pointers */
#define RtdEnableCGT(dev, v) \
writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE)
@ -797,7 +793,8 @@ static void rtd_load_channelgain_list(struct comedi_device *dev,
{
if (n_chan > 1) { /* setup channel gain table */
int ii;
RtdClearCGT(dev);
writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
RtdEnableCGT(dev, 1); /* enable table */
for (ii = 0; ii < n_chan; ii++) {
RtdWriteCGTable(dev, rtdConvertChanGain(dev, list[ii],
@ -2049,7 +2046,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
RtdInterruptClearMask(dev, ~0); /* and sets shadow */
RtdInterruptClear(dev); /* clears bits set by mask */
RtdInterruptOverrunClear(dev);
RtdClearCGT(dev);
writel(0, devpriv->las0 + LAS0_CGT_CLEAR);
RtdAdcClearFifo(dev);
RtdDacClearFifo(dev, 0);
RtdDacClearFifo(dev, 1);