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

staging: comedi: adv_pci1710: use comedi_handle_events()

cfc_handle_events() is just a wrapper around comedi_handle_events().
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 f5b5164d
...@@ -749,14 +749,14 @@ static void pci1710_handle_every_sample(struct comedi_device *dev, ...@@ -749,14 +749,14 @@ static void pci1710_handle_every_sample(struct comedi_device *dev,
if (status & Status_FE) { if (status & Status_FE) {
dev_dbg(dev->class_dev, "A/D FIFO empty (%4x)\n", status); dev_dbg(dev->class_dev, "A/D FIFO empty (%4x)\n", status);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
return; return;
} }
if (status & Status_FF) { if (status & Status_FF) {
dev_dbg(dev->class_dev, dev_dbg(dev->class_dev,
"A/D FIFO Full status (Fatal Error!) (%4x)\n", status); "A/D FIFO Full status (Fatal Error!) (%4x)\n", status);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
return; return;
} }
...@@ -790,7 +790,7 @@ static void pci1710_handle_every_sample(struct comedi_device *dev, ...@@ -790,7 +790,7 @@ static void pci1710_handle_every_sample(struct comedi_device *dev,
outb(0, dev->iobase + PCI171x_CLRINT); /* clear our INT request */ outb(0, dev->iobase + PCI171x_CLRINT); /* clear our INT request */
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
} }
/* /*
...@@ -837,14 +837,14 @@ static void pci1710_handle_fifo(struct comedi_device *dev, ...@@ -837,14 +837,14 @@ static void pci1710_handle_fifo(struct comedi_device *dev,
if (!(m & Status_FH)) { if (!(m & Status_FH)) {
dev_dbg(dev->class_dev, "A/D FIFO not half full! (%4x)\n", m); dev_dbg(dev->class_dev, "A/D FIFO not half full! (%4x)\n", m);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
return; return;
} }
if (m & Status_FF) { if (m & Status_FF) {
dev_dbg(dev->class_dev, dev_dbg(dev->class_dev,
"A/D FIFO Full status (Fatal Error!) (%4x)\n", m); "A/D FIFO Full status (Fatal Error!) (%4x)\n", m);
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
return; return;
} }
...@@ -865,12 +865,12 @@ static void pci1710_handle_fifo(struct comedi_device *dev, ...@@ -865,12 +865,12 @@ static void pci1710_handle_fifo(struct comedi_device *dev,
devpriv->ai_act_scan >= cmd->stop_arg) { devpriv->ai_act_scan >= cmd->stop_arg) {
/* all data sampled */ /* all data sampled */
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
return; return;
} }
outb(0, dev->iobase + PCI171x_CLRINT); /* clear our INT request */ outb(0, dev->iobase + PCI171x_CLRINT); /* clear our INT request */
cfc_handle_events(dev, s); comedi_handle_events(dev, s);
} }
/* /*
......
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