Commit 1a4888c1 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: adl_pci9111: 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 c0618689

drivers/staging/comedi/drivers/adl_pci9111.c

+25 −23
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ TODO: 
#include "../comedi_pci.h"



#include "plx9052.h"

#include "comedi_fc.h"

#include "comedi_8254.h"



#define PCI9111_FIFO_HALF_SIZE	512
@@ -267,13 +266,13 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, 


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



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

	err |= cfc_check_trigger_src(&cmd->scan_begin_src,

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

	err |= comedi_check_trigger_src(&cmd->scan_begin_src,

					TRIG_TIMER | TRIG_FOLLOW | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->convert_src,

	err |= comedi_check_trigger_src(&cmd->convert_src,

					TRIG_TIMER | TRIG_EXT);

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

	err |= cfc_check_trigger_src(&cmd->stop_src,

	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)
@@ -281,9 +280,9 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, 


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



	err |= cfc_check_trigger_is_unique(cmd->scan_begin_src);

	err |= cfc_check_trigger_is_unique(cmd->convert_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);

	err |= comedi_check_trigger_is_unique(cmd->scan_begin_src);

	err |= comedi_check_trigger_is_unique(cmd->convert_src);

	err |= comedi_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */
@@ -297,26 +296,29 @@ static int pci9111_ai_do_cmd_test(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->convert_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

	if (cmd->convert_src == TRIG_TIMER) {

		err |= comedi_check_trigger_arg_min(&cmd->convert_arg,

					PCI9111_AI_ACQUISITION_PERIOD_MIN_NS);

	else	/* TRIG_EXT */

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

	} else {	/* TRIG_EXT */

		err |= comedi_check_trigger_arg_is(&cmd->convert_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,

					PCI9111_AI_ACQUISITION_PERIOD_MIN_NS);

	else	/* TRIG_FOLLOW || TRIG_EXT */

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

	} else {	/* TRIG_FOLLOW || TRIG_EXT */

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

	}



	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;
@@ -326,7 +328,7 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, 
	if (cmd->convert_src == TRIG_TIMER) {

		arg = cmd->convert_arg;

		comedi_8254_cascade_ns_to_timer(dev->pacer, &arg, cmd->flags);

		err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);

		err |= comedi_check_trigger_arg_is(&cmd->convert_arg, arg);

	}



	/*
@@ -339,7 +341,7 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, 
		if (arg < cmd->scan_begin_arg)

			arg *= (cmd->scan_begin_arg / arg);



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

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

	}



	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE