Commit b504252a authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: dmm32at: 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 5519108b
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "../comedidev.h" #include "../comedidev.h"
#include "8255.h" #include "8255.h"
#include "comedi_fc.h"
/* Board register addresses */ /* Board register addresses */
#define DMM32AT_AI_START_CONV_REG 0x00 #define DMM32AT_AI_START_CONV_REG 0x00
...@@ -274,18 +273,18 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev, ...@@ -274,18 +273,18 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
/* Step 1 : check if triggers are trivially valid */ /* 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);
err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_TIMER); err |= comedi_check_trigger_src(&cmd->scan_begin_src, TRIG_TIMER);
err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER); err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_TIMER);
err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT); err |= comedi_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->stop_src, TRIG_COUNT | TRIG_NONE);
if (err) if (err)
return 1; return 1;
/* Step 2a : make sure trigger sources are unique */ /* 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 */ /* Step 2b : and mutually compatible */
...@@ -294,10 +293,10 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev, ...@@ -294,10 +293,10 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
/* Step 3: check if arguments are trivially valid */ /* 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_min(&cmd->scan_begin_arg, 1000000); err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg, 1000000);
err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 1000000000); err |= comedi_check_trigger_arg_max(&cmd->scan_begin_arg, 1000000000);
if (cmd->convert_arg >= 17500) if (cmd->convert_arg >= 17500)
cmd->convert_arg = 20000; cmd->convert_arg = 20000;
...@@ -308,12 +307,13 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev, ...@@ -308,12 +307,13 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
else else
cmd->convert_arg = 5000; cmd->convert_arg = 5000;
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) 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 */ 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) if (err)
return 3; return 3;
...@@ -321,7 +321,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev, ...@@ -321,7 +321,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
/* Step 4: fix up any arguments */ /* Step 4: fix up any arguments */
arg = cmd->convert_arg * cmd->scan_end_arg; arg = cmd->convert_arg * cmd->scan_end_arg;
err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg, arg); err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg, arg);
if (err) if (err)
return 4; return 4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment