Commit 2f1f7ea0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl818: 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_PCL818 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 61c3393f
...@@ -199,6 +199,7 @@ config COMEDI_PCL816 ...@@ -199,6 +199,7 @@ config COMEDI_PCL816
config COMEDI_PCL818 config COMEDI_PCL818
tristate "Advantech PCL-718 and PCL-818 ISA card support" tristate "Advantech PCL-718 and PCL-818 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-818 ISA cards Enable support for Advantech PCL-818 ISA cards
PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718 PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718
......
...@@ -510,7 +510,6 @@ static bool pcl818_ai_dropout(struct comedi_device *dev, ...@@ -510,7 +510,6 @@ static bool pcl818_ai_dropout(struct comedi_device *dev,
(devpriv->dma) ? "DMA" : (devpriv->dma) ? "DMA" :
(devpriv->usefifo) ? "FIFO" : "IRQ", (devpriv->usefifo) ? "FIFO" : "IRQ",
chan, expected_chan); chan, expected_chan);
s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return true; return true;
} }
...@@ -538,7 +537,6 @@ static bool pcl818_ai_next_chan(struct comedi_device *dev, ...@@ -538,7 +537,6 @@ static bool pcl818_ai_next_chan(struct comedi_device *dev,
if (cmd->stop_src == TRIG_COUNT && devpriv->ai_act_scan == 0) { if (cmd->stop_src == TRIG_COUNT && devpriv->ai_act_scan == 0) {
/* 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;
} }
...@@ -554,7 +552,6 @@ static void pcl818_handle_eoc(struct comedi_device *dev, ...@@ -554,7 +552,6 @@ static void pcl818_handle_eoc(struct comedi_device *dev,
if (pcl818_ai_eoc(dev, s, NULL, 0)) { if (pcl818_ai_eoc(dev, s, NULL, 0)) {
comedi_error(dev, "A/D mode1/3 IRQ without DRDY!"); comedi_error(dev, "A/D mode1/3 IRQ without DRDY!");
s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return; return;
} }
...@@ -612,14 +609,12 @@ static void pcl818_handle_fifo(struct comedi_device *dev, ...@@ -612,14 +609,12 @@ static void pcl818_handle_fifo(struct comedi_device *dev,
if (status & 4) { if (status & 4) {
comedi_error(dev, "A/D mode1/3 FIFO overflow!"); comedi_error(dev, "A/D mode1/3 FIFO overflow!");
s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return; return;
} }
if (status & 1) { if (status & 1) {
comedi_error(dev, "A/D mode1/3 FIFO interrupt without data!"); comedi_error(dev, "A/D mode1/3 FIFO interrupt without data!");
s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return; return;
} }
...@@ -674,7 +669,7 @@ static irqreturn_t pcl818_interrupt(int irq, void *d) ...@@ -674,7 +669,7 @@ static irqreturn_t pcl818_interrupt(int irq, void *d)
pcl818_ai_clear_eoc(dev); pcl818_ai_clear_eoc(dev);
comedi_event(dev, s); cfc_handle_events(dev, s);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
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