Commit 71bb49d0 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: dt2814: 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 b504252a

drivers/staging/comedi/drivers/dt2814.c

+15 −16
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ addition, the clock does not seem to be very accurate. 


#include <linux/delay.h>



#include "comedi_fc.h"



#define DT2814_CSR 0

#define DT2814_DATA 1
@@ -129,18 +127,18 @@ static int dt2814_ai_cmdtest(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, 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);

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

	err |= comedi_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */
@@ -149,18 +147,19 @@ static int dt2814_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);



	err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 1000000000);

	err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

	err |= comedi_check_trigger_arg_max(&cmd->scan_begin_arg, 1000000000);

	err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,

					    DT2814_MAX_SPEED);



	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, 2);

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

	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;
@@ -169,7 +168,7 @@ static int dt2814_ai_cmdtest(struct comedi_device *dev, 


	arg = cmd->scan_begin_arg;

	dt2814_ns_to_timer(&arg, cmd->flags);

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

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



	if (err)

		return 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE