Commit 61c3393f authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl816: use cfc_handle_events()

Use the comedi_fc helper function to automatically call the subdevice
(*cancel) function when needed and call comedi_event().

Update the Kconfig so that COMEDI_PCL816 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 8a8bd454
...@@ -189,6 +189,7 @@ config COMEDI_PCL812 ...@@ -189,6 +189,7 @@ config COMEDI_PCL812
config COMEDI_PCL816 config COMEDI_PCL816
tristate "Advantech PCL-814 and PCL-816 ISA card support" tristate "Advantech PCL-814 and PCL-816 ISA card support"
depends on VIRT_TO_BUS && ISA_DMA_API depends on VIRT_TO_BUS && ISA_DMA_API
select COMEDI_FC
---help--- ---help---
Enable support for Advantech PCL-814 and PCL-816 ISA cards Enable support for Advantech PCL-814 and PCL-816 ISA cards
......
...@@ -307,7 +307,6 @@ static bool pcl816_ai_next_chan(struct comedi_device *dev, ...@@ -307,7 +307,6 @@ static bool pcl816_ai_next_chan(struct comedi_device *dev,
if (cmd->stop_src == TRIG_COUNT && if (cmd->stop_src == TRIG_COUNT &&
devpriv->ai_act_scan >= cmd->stop_arg) { devpriv->ai_act_scan >= cmd->stop_arg) {
/* all data sampled */ /* all data sampled */
s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
return false; return false;
} }
...@@ -362,7 +361,7 @@ static irqreturn_t pcl816_interrupt(int irq, void *d) ...@@ -362,7 +361,7 @@ static irqreturn_t pcl816_interrupt(int irq, void *d)
pcl816_ai_clear_eoc(dev); pcl816_ai_clear_eoc(dev);
comedi_event(dev, s); cfc_handle_events(dev, s);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -520,7 +519,7 @@ static int pcl816_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -520,7 +519,7 @@ static int pcl816_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_poll_ptr = top1; /* new buffer position */ devpriv->ai_poll_ptr = top1; /* new buffer position */
spin_unlock_irqrestore(&dev->spinlock, flags); spin_unlock_irqrestore(&dev->spinlock, flags);
comedi_event(dev, s); cfc_handle_events(dev, s);
return s->async->buf_write_count - s->async->buf_read_count; return s->async->buf_write_count - s->async->buf_read_count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment