Commit 51ec1db9 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: me4000: 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 86ca1cdd

drivers/staging/comedi/drivers/me4000.c

+14 −14
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ broken. 


#include "../comedi_pci.h"



#include "comedi_fc.h"

#include "comedi_8254.h"

#include "plx9052.h"
@@ -833,24 +832,25 @@ static int me4000_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 | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src,

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

	err |= comedi_check_trigger_src(&cmd->scan_begin_src,

					TRIG_FOLLOW | TRIG_TIMER | TRIG_EXT);

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

	err |= cfc_check_trigger_src(&cmd->scan_end_src,

	err |= comedi_check_trigger_src(&cmd->convert_src,

					TRIG_TIMER | TRIG_EXT);

	err |= comedi_check_trigger_src(&cmd->scan_end_src,

					TRIG_NONE | TRIG_COUNT);

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

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



	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->scan_begin_src);

	err |= cfc_check_trigger_is_unique(cmd->convert_src);

	err |= cfc_check_trigger_is_unique(cmd->scan_end_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->scan_begin_src);

	err |= comedi_check_trigger_is_unique(cmd->convert_src);

	err |= comedi_check_trigger_is_unique(cmd->scan_end_src);

	err |= comedi_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */
@@ -881,7 +881,7 @@ static int me4000_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->chanlist_len < 1) {

		cmd->chanlist_len = 1;
@@ -901,9 +901,9 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev, 
	}



	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