Skip to content

Commit

Permalink
staging: comedi: adl_pci9111: use cfc_handle_events()
Browse files Browse the repository at this point in the history
Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

In the Kconfig, COMEDI_ADL_PCI9111 already selects COMEDI_FC.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 17, 2014
1 parent def69d7 commit 0056f54
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,8 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device)
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
comedi_error(dev, PCI9111_DRIVER_NAME " fifo overflow");
outb(0, dev->iobase + PCI9111_INT_CLR_REG);
pci9111_ai_cancel(dev, s);
async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
comedi_event(dev, s);
cfc_handle_events(dev, s);

return IRQ_HANDLED;
}
Expand Down Expand Up @@ -672,16 +671,14 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device)
}
}

if ((dev_private->stop_counter == 0) && (!dev_private->stop_is_none)) {
if (dev_private->stop_counter == 0 && !dev_private->stop_is_none)
async->events |= COMEDI_CB_EOA;
pci9111_ai_cancel(dev, s);
}

outb(0, dev->iobase + PCI9111_INT_CLR_REG);

spin_unlock_irqrestore(&dev->spinlock, irq_flags);

comedi_event(dev, s);
cfc_handle_events(dev, s);

return IRQ_HANDLED;
}
Expand Down

0 comments on commit 0056f54

Please sign in to comment.