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

staging: comedi: amplc_pci224: 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 29d9edd0

drivers/staging/comedi/drivers/amplc_pci224.c

+20 −20
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ 


#include "../comedi_pci.h"



#include "comedi_fc.h"

#include "comedi_8254.h"



/*
@@ -666,12 +665,12 @@ pci224_ao_cmdtest(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_INT | TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src,

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

	err |= comedi_check_trigger_src(&cmd->scan_begin_src,

					TRIG_EXT | 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,

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



	if (err)
@@ -679,9 +678,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 


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



	/* Step 2b : and mutually compatible */
@@ -706,7 +705,7 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 


	switch (cmd->start_src) {

	case TRIG_INT:

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

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

		break;

	case TRIG_EXT:

		/* Force to external trigger 0. */
@@ -726,13 +725,13 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 


	switch (cmd->scan_begin_src) {

	case TRIG_TIMER:

		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,

		err |= comedi_check_trigger_arg_max(&cmd->scan_begin_arg,

						    MAX_SCAN_PERIOD);



		arg = cmd->chanlist_len * CONVERT_PERIOD;

		if (arg < MIN_SCAN_PERIOD)

			arg = MIN_SCAN_PERIOD;

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

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

		break;

	case TRIG_EXT:

		/* Force to external trigger 0. */
@@ -752,12 +751,13 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 
		break;

	}



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

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

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

	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,

					   cmd->chanlist_len);



	switch (cmd->stop_src) {

	case TRIG_COUNT:

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

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

		break;

	case TRIG_EXT:

		/* Force to external trigger 0. */
@@ -773,7 +773,7 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 
		}

		break;

	case TRIG_NONE:

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

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

		break;

	}
@@ -786,7 +786,7 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 
		arg = cmd->scan_begin_arg;

		/* Use two timers. */

		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 (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE