Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8511b858 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_mio_common: remove forward declaration 15 



Move ni_ai_inttrig() 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 f8246dfa

drivers/staging/comedi/drivers/ni_mio_common.c

+17 −19
Original line number Diff line number Diff line
@@ -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,