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

staging: comedi: das16: 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 61f76970

drivers/staging/comedi/drivers/das16.c

+25 −22
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 
#include "../comedidev.h"



#include "comedi_isadma.h"

#include "comedi_fc.h"

#include "comedi_8254.h"

#include "8255.h"
@@ -599,29 +598,29 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, 


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



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

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



	trig_mask = TRIG_FOLLOW;

	if (devpriv->can_burst)

		trig_mask |= TRIG_TIMER | TRIG_EXT;

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

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



	trig_mask = TRIG_TIMER | TRIG_EXT;

	if (devpriv->can_burst)

		trig_mask |= TRIG_NOW;

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

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



	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->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->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 */
@@ -636,26 +635,30 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, 


	/* 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);



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



	/* check against maximum frequency */

	if (cmd->scan_begin_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

					board->ai_speed * cmd->chanlist_len);

	if (cmd->scan_begin_src == TRIG_TIMER) {

		err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,

						    board->ai_speed *

						    cmd->chanlist_len);

	}



	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,

						    board->ai_speed);

	}



	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;
@@ -664,12 +667,12 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, 
	if (cmd->scan_begin_src == TRIG_TIMER) {

		arg = cmd->scan_begin_arg;

		comedi_8254_cascade_ns_to_timer(dev->pacer, &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 (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);

	}

	if (err)

		return 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE