Skip to content

Commit

Permalink
staging: comedi: rtd520: remove RtdInterruptStatus 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
'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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 13, 2012
1 parent 5d4a934 commit 732941a
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 */

/* Interrupt status */
#define RtdInterruptStatus(dev) \
readw(devpriv->las0+LAS0_IT)

/* Interrupt mask */
#define RtdInterruptMask(dev, v) \
writew((devpriv->intMask = (v)), devpriv->las0+LAS0_IT)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1175,7 +1171,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */
comedi_event(dev, s);

/* clear the interrupt */
status = RtdInterruptStatus(dev);
status = readw(devpriv->las0 + LAS0_IT);
RtdInterruptClearMask(dev, status);
RtdInterruptClear(dev);

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 732941a

Please sign in to comment.