From 061aa793ceaa1c7af3521ccf628bd85b78b51530 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 10 Jul 2012 16:52:45 -0700 Subject: [PATCH] --- yaml --- r: 317907 b: refs/heads/master c: 732941ad7f93700f79371bfdf8ec1c521a7c7d54 h: refs/heads/master i: 317905: b0ec13016589814fc240953cc0fac738811b4a4a 317903: 463e4eb944396b74506d5e4d43055029858cdbc9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index bd5d83172dd2..38155082fcfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d4a93438d9b0a97ca670f73ee77122279e6f1ac +refs/heads/master: 732941ad7f93700f79371bfdf8ec1c521a7c7d54 diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index 5fca77b423bc..c3810ea53cce 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/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 @@ 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); @@ -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,