Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0056f548 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: adl_pci9111: use cfc_handle_events() 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent def69d7f

drivers/staging/comedi/drivers/adl_pci9111.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

		}
@@ -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;

}