Skip to content

Commit

Permalink
staging: comedi: rtd520: remove RtdEnableCGT macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 13, 2012
1 parent 67e50c6 commit cfe43ed
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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));
}
}
Expand Down

0 comments on commit cfe43ed

Please sign in to comment.