Commit 5d4a9343 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: rtd520: remove RtdPacerStop 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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18e18ddd
...@@ -406,10 +406,6 @@ struct rtdPrivate { ...@@ -406,10 +406,6 @@ struct rtdPrivate {
/* Macros to access registers */ /* Macros to access registers */
/* pacer start/stop read=start, write=stop*/
#define RtdPacerStop(dev) \
writel(0, devpriv->las0+LAS0_PACER)
/* Interrupt status */ /* Interrupt status */
#define RtdInterruptStatus(dev) \ #define RtdInterruptStatus(dev) \
readw(devpriv->las0+LAS0_IT) readw(devpriv->las0+LAS0_IT)
...@@ -1152,7 +1148,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ ...@@ -1152,7 +1148,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */
transferDone: transferDone:
writel(0, devpriv->las0 + LAS0_PACER_STOP); writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */ writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION); writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0); /* mask out SAMPLE */ RtdInterruptMask(dev, 0); /* mask out SAMPLE */
#ifdef USE_DMA #ifdef USE_DMA
...@@ -1421,7 +1417,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1421,7 +1417,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* stop anything currently running */ /* stop anything currently running */
writel(0, devpriv->las0 + LAS0_PACER_STOP); 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); writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0); RtdInterruptMask(dev, 0);
#ifdef USE_DMA #ifdef USE_DMA
...@@ -1619,7 +1615,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1619,7 +1615,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
u16 status; u16 status;
writel(0, devpriv->las0 + LAS0_PACER_STOP); writel(0, devpriv->las0 + LAS0_PACER_STOP);
RtdPacerStop(dev); /* Stop PACER */ writel(0, devpriv->las0 + LAS0_PACER);
writel(0, devpriv->las0 + LAS0_ADC_CONVERSION); writel(0, devpriv->las0 + LAS0_ADC_CONVERSION);
RtdInterruptMask(dev, 0); RtdInterruptMask(dev, 0);
devpriv->aiCount = 0; /* stop and don't transfer any more */ devpriv->aiCount = 0; /* stop and don't transfer any more */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment