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

staging: comedi: ni_mio_common: remove forward declaration 14

Move shutdown_ai_command() to remove the need for the forward
declaration.
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 189e1736
...@@ -211,7 +211,6 @@ static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -211,7 +211,6 @@ static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned int trignum); unsigned int trignum);
static void ni_load_channelgain_list(struct comedi_device *dev, static void ni_load_channelgain_list(struct comedi_device *dev,
unsigned int n_chan, unsigned int *list); unsigned int n_chan, unsigned int *list);
static void shutdown_ai_command(struct comedi_device *dev);
static void handle_gpct_interrupt(struct comedi_device *dev, static void handle_gpct_interrupt(struct comedi_device *dev,
unsigned short counter_index); unsigned short counter_index);
...@@ -822,8 +821,22 @@ static int ni_ao_wait_for_dma_load(struct comedi_device *dev) ...@@ -822,8 +821,22 @@ static int ni_ao_wait_for_dma_load(struct comedi_device *dev)
} }
return 0; return 0;
} }
#endif /* PCIDMA */ #endif /* PCIDMA */
static void shutdown_ai_command(struct comedi_device *dev)
{
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
#ifdef PCIDMA
ni_ai_drain_dma(dev);
#endif
ni_handle_fifo_dregs(dev);
get_last_sample_611x(dev);
get_last_sample_6143(dev);
s->async->events |= COMEDI_CB_EOA;
}
static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s) static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
...@@ -849,20 +862,6 @@ static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -849,20 +862,6 @@ static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s)
shutdown_ai_command(dev); shutdown_ai_command(dev);
} }
static void shutdown_ai_command(struct comedi_device *dev)
{
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
#ifdef PCIDMA
ni_ai_drain_dma(dev);
#endif
ni_handle_fifo_dregs(dev);
get_last_sample_611x(dev);
get_last_sample_6143(dev);
s->async->events |= COMEDI_CB_EOA;
}
static void handle_gpct_interrupt(struct comedi_device *dev, static void handle_gpct_interrupt(struct comedi_device *dev,
unsigned short counter_index) unsigned short counter_index)
{ {
......
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