staging: comedi: ni_mio_common: remove forward declaration 15

Move ni_ai_inttrig() to remove the need for the forward declaration.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index e5463c9253aa76c8e558f0b16b61c79023857f9b..d520417fc0dc6611ec981ca4e1e79b44ca426723 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -207,8 +207,6 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev,
                                 struct comedi_subdevice *s);
 #endif
 static void ni_handle_fifo_dregs(struct comedi_device *dev);
-static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
-                        unsigned int trignum);
 static void ni_load_channelgain_list(struct comedi_device *dev,
                                     unsigned int n_chan, unsigned int *list);
 
@@ -2151,6 +2149,23 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
        return 0;
 }
 
+static int ni_ai_inttrig(struct comedi_device *dev,
+                        struct comedi_subdevice *s,
+                        unsigned int trig_num)
+{
+       struct ni_private *devpriv = dev->private;
+       struct comedi_cmd *cmd = &s->async->cmd;
+
+       if (trig_num != cmd->start_arg)
+               return -EINVAL;
+
+       devpriv->stc_writew(dev, AI_START1_Pulse | devpriv->ai_cmd2,
+                           AI_Command_2_Register);
+       s->async->inttrig = NULL;
+
+       return 1;
+}
+
 static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        const struct ni_board_struct *board = comedi_board(dev);
@@ -2446,23 +2461,6 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        return 0;
 }
 
-static int ni_ai_inttrig(struct comedi_device *dev,
-                        struct comedi_subdevice *s,
-                        unsigned int trig_num)
-{
-       struct ni_private *devpriv = dev->private;
-       struct comedi_cmd *cmd = &s->async->cmd;
-
-       if (trig_num != cmd->start_arg)
-               return -EINVAL;
-
-       devpriv->stc_writew(dev, AI_START1_Pulse | devpriv->ai_cmd2,
-                           AI_Command_2_Register);
-       s->async->inttrig = NULL;
-
-       return 1;
-}
-
 static int ni_ai_config_analog_trig(struct comedi_device *dev,
                                    struct comedi_subdevice *s,
                                    struct comedi_insn *insn,