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

staging: comedi: ni_mio_common: remove forward declaration 12

Remove the need for the forward declaration of ni_cdio_cancel() by
indirectly calling it using the subdevice (*cancel).
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 0792928f
...@@ -194,8 +194,6 @@ static const struct comedi_lrange *const ni_range_lkup[] = { ...@@ -194,8 +194,6 @@ static const struct comedi_lrange *const ni_range_lkup[] = {
[ai_gain_6143] = &range_bipolar5 [ai_gain_6143] = &range_bipolar5
}; };
static int ni_cdio_cancel(struct comedi_device *dev,
struct comedi_subdevice *s);
static void handle_cdio_interrupt(struct comedi_device *dev); static void handle_cdio_interrupt(struct comedi_device *dev);
static int ni_serial_hw_readwrite8(struct comedi_device *dev, static int ni_serial_hw_readwrite8(struct comedi_device *dev,
...@@ -3485,7 +3483,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, ...@@ -3485,7 +3483,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev,
} }
if (i == timeout) { if (i == timeout) {
comedi_error(dev, "dma failed to fill cdo fifo!"); comedi_error(dev, "dma failed to fill cdo fifo!");
ni_cdio_cancel(dev, s); s->cancel(dev, s);
return -EIO; return -EIO;
} }
ni_writel(CDO_Arm_Bit | CDO_Error_Interrupt_Enable_Set_Bit | ni_writel(CDO_Arm_Bit | CDO_Error_Interrupt_Enable_Set_Bit |
......
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