staging: comedi: rtd520: remove RtdInterruptStatus 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
'readw'. 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>

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 5fca77b423bc77ab6b16d3f558e9bae8e1634ac8..c3810ea53cceb4a9cceef169ac7121766e879a83 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Interrupt status */
-#define RtdInterruptStatus(dev) \
-       readw(devpriv->las0+LAS0_IT)
-
 /* Interrupt mask */
 #define RtdInterruptMask(dev, v) \
        writew((devpriv->intMask = (v)), devpriv->las0+LAS0_IT)
@@ -1078,7 +1074,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */
        /* Fall through and check for other interrupt sources */
 #endif /* USE_DMA */
 
-       status = RtdInterruptStatus(dev);
+       status = readw(devpriv->las0 + LAS0_IT);
        /* if interrupt was not caused by our board, or handled above */
        if (0 == status)
                return IRQ_HANDLED;
@@ -1175,7 +1171,7 @@ transferDone:
        comedi_event(dev, s);
 
        /* clear the interrupt */
-       status = RtdInterruptStatus(dev);
+       status = readw(devpriv->las0 + LAS0_IT);
        RtdInterruptClearMask(dev, status);
        RtdInterruptClear(dev);
 
@@ -1627,7 +1623,7 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
                devpriv->flags &= ~DMA0_ACTIVE;
        }
 #endif /* USE_DMA */
-       status = RtdInterruptStatus(dev);
+       status = readw(devpriv->las0 + LAS0_IT);
        DPRINTK
            ("rtd520: Acquisition canceled. %ld ints, intStat=%x, overStat=%x\n",
             devpriv->intCount, status,