Skip to content

Commit

Permalink
staging: comedi: rtd520: remove RtdPacerStop 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 18e18dd commit 5d4a934
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 */

/* pacer start/stop read=start, write=stop*/
#define RtdPacerStop(dev) \
writel(0, devpriv->las0+LAS0_PACER)

/* Interrupt status */
#define RtdInterruptStatus(dev) \
readw(devpriv->las0+LAS0_IT)
Expand Down Expand Up @@ -1152,7 +1148,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */

transferDone:
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */
writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0); /* mask out SAMPLE */
#ifdef USE_DMA
Expand Down Expand Up @@ -1421,7 +1417,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

/* stop anything currently running */
writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* make sure PACER is stopped */
writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0);
#ifdef USE_DMA
Expand Down Expand Up @@ -1619,7 +1615,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
u16 status;

writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */
writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0);
devpriv->aiCount = 0; /* stop and don't transfer any more */
Expand Down

0 comments on commit 5d4a934

Please sign in to comment.