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

Commit c8508a1d 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 6 



Move the ni_gpct_cmd() and ni_gpct_cancel() functions to remove the
need for the forward declarations.

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 62c2bce0

drivers/staging/comedi/drivers/ni_mio_common.c

+31 −37
Original line number Diff line number Diff line
@@ -253,10 +253,6 @@ static void shutdown_ai_command(struct comedi_device *dev); 
static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,

			 unsigned int trignum);



#ifdef PCIDMA

static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s);

static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s);

#endif

static void handle_gpct_interrupt(struct comedi_device *dev,

				  unsigned short counter_index);
@@ -4514,6 +4510,37 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev, 
	return 1;

}



#ifdef PCIDMA

static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

{

	struct ni_gpct *counter = s->private;

	int retval;



	retval = ni_request_gpct_mite_channel(dev, counter->counter_index,

					      COMEDI_INPUT);

	if (retval) {

		comedi_error(dev,

			     "no dma channel available for use by counter");

		return retval;

	}

	ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);

	ni_e_series_enable_second_irq(dev, counter->counter_index, 1);



	return ni_tio_cmd(dev, s);

}



static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s)

{

	struct ni_gpct *counter = s->private;

	int retval;



	retval = ni_tio_cancel(counter);

	ni_e_series_enable_second_irq(dev, counter->counter_index, 0);

	ni_release_gpct_mite_channel(dev, counter->counter_index);

	return retval;

}

#endif



static int ni_E_init(struct comedi_device *dev)

{

	const struct ni_board_struct *board = comedi_board(dev);
@@ -4933,39 +4960,6 @@ static void GPCT_Reset(struct comedi_device *dev, int chan) 


#endif



#ifdef PCIDMA

static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

{

	struct ni_gpct *counter = s->private;

	int retval;



	retval = ni_request_gpct_mite_channel(dev, counter->counter_index,

					      COMEDI_INPUT);

	if (retval) {

		comedi_error(dev,

			     "no dma channel available for use by counter");

		return retval;

	}

	ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);

	ni_e_series_enable_second_irq(dev, counter->counter_index, 1);



	return ni_tio_cmd(dev, s);

}

#endif



#ifdef PCIDMA

static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s)

{

	struct ni_gpct *counter = s->private;

	int retval;



	retval = ni_tio_cancel(counter);

	ni_e_series_enable_second_irq(dev, counter->counter_index, 0);

	ni_release_gpct_mite_channel(dev, counter->counter_index);

	return retval;

}

#endif



/*

 *

 *  Programmable Function Inputs