Commit 8a8626b4 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: usbduxsigma: remove #include "comedi_fc.h" 



As preparation for removal of "comedi_fc.h", replace calls to the
`cfc_check_trigger_...` functions from "comedi_fc.h" with the
replacement `comedi_check_trigger_...` functions from "../comedidev.h"
and remove the inclusion of "comedi_fc.h".

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f53398eb

drivers/staging/comedi/drivers/usbduxsigma.c

+39 −34
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include <linux/compiler.h>

#include <asm/unaligned.h>



#include "comedi_fc.h"

#include "../comedi_usb.h"



/* timeout for the USB-transfer in ms*/
@@ -486,19 +485,19 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 


	/* Step 1 : check if triggers are trivially valid */



	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_TIMER);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);

	err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);

	err |= comedi_check_trigger_src(&cmd->scan_begin_src, TRIG_TIMER);

	err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);



	if (err)

		return 1;



	/* Step 2a : make sure trigger sources are unique */



	err |= cfc_check_trigger_is_unique(cmd->start_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);

	err |= comedi_check_trigger_is_unique(cmd->start_src);

	err |= comedi_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */
@@ -507,10 +506,10 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 


	/* Step 3: check if arguments are trivially valid */



	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);

	err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);



	if (cmd->scan_begin_src == TRIG_FOLLOW)	/* internal trigger */

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);

		err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);



	if (cmd->scan_begin_src == TRIG_TIMER) {

		unsigned int tmp;
@@ -522,27 +521,31 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 
			 * sample two channels. Thus, the more channels

			 * are in the channel list the more time we need.

			 */

			err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

						(1000000 / 8 * interval));

			err |= comedi_check_trigger_arg_min(&cmd->

							    scan_begin_arg,

							    (1000000 / 8 *

							     interval));



			tmp = (cmd->scan_begin_arg / 125000) * 125000;

		} else {

			/* full speed */

			/* 1kHz scans every USB frame */

			err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

			err |= comedi_check_trigger_arg_min(&cmd->

							    scan_begin_arg,

							    1000000);



			tmp = (cmd->scan_begin_arg / 1000000) * 1000000;

		}

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, tmp);

		err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, tmp);

	}



	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,

					   cmd->chanlist_len);



	if (cmd->stop_src == TRIG_COUNT)

		err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);

		err |= comedi_check_trigger_arg_min(&cmd->stop_arg, 1);

	else	/* TRIG_NONE */

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		err |= comedi_check_trigger_arg_is(&cmd->stop_arg, 0);



	if (err)

		return 3;
@@ -854,7 +857,7 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev, 


	/* Step 1 : check if triggers are trivially valid */



	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);

	err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);



	if (high_speed) {

		/*
@@ -866,11 +869,11 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev, 
		/* start a new scan (output at once) with a timer */

		flags = TRIG_TIMER;

	}

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, flags);

	err |= comedi_check_trigger_src(&cmd->scan_begin_src, flags);



	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);

	err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);



	if (err) {

		up(&devpriv->sem);
@@ -879,8 +882,8 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev, 


	/* Step 2a : make sure trigger sources are unique */



	err |= cfc_check_trigger_is_unique(cmd->start_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);

	err |= comedi_check_trigger_is_unique(cmd->start_src);

	err |= comedi_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */
@@ -889,25 +892,27 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev, 


	/* Step 3: check if arguments are trivially valid */



	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);

	err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);



	if (cmd->scan_begin_src == TRIG_FOLLOW)	/* internal trigger */

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);

		err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);



	if (cmd->scan_begin_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

	if (cmd->scan_begin_src == TRIG_TIMER) {

		err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,

						    1000000);

	}



	/* not used now, is for later use */

	if (cmd->convert_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 125000);

		err |= comedi_check_trigger_arg_min(&cmd->convert_arg, 125000);



	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,

					   cmd->chanlist_len);



	if (cmd->stop_src == TRIG_COUNT)

		err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);

		err |= comedi_check_trigger_arg_min(&cmd->stop_arg, 1);

	else	/* TRIG_NONE */

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		err |= comedi_check_trigger_arg_is(&cmd->stop_arg, 0);



	if (err)

		return 3;

CRA Git | Maintained and supported by SUSTech CRA and CCSE