leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: ni_mio_common: simplify AI LINKC handling

Browse Source 
Simplfy the LINKC handing for the analog input dma by moving it into
the main interrupt handler. This function already hold the spinlock
mite_channel_lock so call mite_sync_dma() directly instead of using
the helper function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2016-04-21 12:04:42 -07:00 committed by Greg Kroah-Hartman
parent ba5c0da886
commit 7101711ee4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -1295,11 +1295,6 @@ static void handle_a_interrupt(struct comedi_device *dev,
{
struct comedi_cmd *cmd = &s->async->cmd;
#ifdef PCIDMA
if (ai_mite_status & CHSR_LINKC)
ni_sync_ai_dma(dev);
#endif
/* test for all uncommon interrupt events at the same time */
if (status & (NISTC_AI_STATUS1_ERR |
NISTC_AI_STATUS1_SC_TC | NISTC_AI_STATUS1_START1)) {
@ -5166,9 +5161,12 @@ static irqreturn_t ni_E_interrupt(int irq, void *d)
unsigned int m_status;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags_too);
if (s_ai && devpriv->ai_mite_chan)
if (s_ai && devpriv->ai_mite_chan) {
ai_mite_status = mite_ack_linkc(devpriv->ai_mite_chan,
s_ai);
if (ai_mite_status & CHSR_LINKC)
mite_sync_dma(devpriv->ai_mite_chan, s_ai);
}
if (s_ao && devpriv->ao_mite_chan) {
m_status = mite_ack_linkc(devpriv->ao_mite_chan, s_ao);