Skip to content

Commit

Permalink
staging: comedi: rtd520: remove RtdPacerStopSource 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 f6104e1 commit 1d137eb
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 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 */

/* Set Pacer stop source select (write only) */
#define RtdPacerStopSource(dev, v) \
writel(v, devpriv->las0+LAS0_PACER_STOP)

/* Set Pacer clock source select (write only) 0=external 1=internal */
#define RtdPacerClockSource(dev, v) \
writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_SELECT)
Expand Down Expand Up @@ -1194,7 +1190,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */
/* fall into transferDone */

transferDone:
RtdPacerStopSource(dev, 0); /* stop on SOFTWARE stop */
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0); /* mask out SAMPLE */
Expand Down Expand Up @@ -1463,7 +1459,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
int timer;

/* stop anything currently running */
RtdPacerStopSource(dev, 0); /* stop on SOFTWARE stop */
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* make sure PACER is stopped */
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0);
Expand Down Expand Up @@ -1661,7 +1657,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{
u16 status;

RtdPacerStopSource(dev, 0); /* stop on SOFTWARE stop */
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0);
Expand Down

0 comments on commit 1d137eb

Please sign in to comment.