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

staging: comedi: ni_pcidio: use cfc_handle_events()

Use the comedi_fc helper function instead of duplicating the code.

In the Kconfig, COMEDI_NI_PCIDIO selects COMEDI_FC indirectly by
selecting COMEDI_MITE which 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 3c5e6a62
...@@ -263,9 +263,6 @@ enum FPGA_Control_Bits { ...@@ -263,9 +263,6 @@ enum FPGA_Control_Bits {
#define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC) #define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC)
#endif #endif
static int ni_pcidio_cancel(struct comedi_device *dev,
struct comedi_subdevice *s);
enum nidio_boardid { enum nidio_boardid {
BOARD_PCIDIO_32HS, BOARD_PCIDIO_32HS,
BOARD_PXI6533, BOARD_PXI6533,
...@@ -353,17 +350,6 @@ static void ni_pcidio_release_di_mite_channel(struct comedi_device *dev) ...@@ -353,17 +350,6 @@ static void ni_pcidio_release_di_mite_channel(struct comedi_device *dev)
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
} }
static void ni_pcidio_event(struct comedi_device *dev,
struct comedi_subdevice *s)
{
if (s->
async->events & (COMEDI_CB_EOA | COMEDI_CB_ERROR |
COMEDI_CB_OVERFLOW)) {
ni_pcidio_cancel(dev, s);
}
comedi_event(dev, s);
}
static int ni_pcidio_poll(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_pcidio_poll(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct nidio96_private *devpriv = dev->private; struct nidio96_private *devpriv = dev->private;
...@@ -501,7 +487,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d) ...@@ -501,7 +487,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
} }
out: out:
ni_pcidio_event(dev, s); cfc_handle_events(dev, s);
#if 0 #if 0
if (!tag) { if (!tag) {
writeb(0x03, writeb(0x03,
......
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