staging: comedi: pcl818: 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: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 21 insertions, 19 deletions

diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 8d933dcad533..e1bdde977302 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -100,7 +100,6 @@
 #include "../comedidev.h"
 
 #include "comedi_isadma.h"
-#include "comedi_fc.h"
 #include "comedi_8254.h"
 
 /* boards constants */
@@ -649,19 +648,20 @@ static int ai_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_NOW);
-        err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_FOLLOW);
-        err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER | TRIG_EXT);
-        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_FOLLOW);
+        err |= comedi_check_trigger_src(&cmd->convert_src,
+                                        TRIG_TIMER | TRIG_EXT);
+        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->convert_src);
-        err |= cfc_check_trigger_is_unique(cmd->stop_src);
+        err |= comedi_check_trigger_is_unique(cmd->convert_src);
+        err |= comedi_check_trigger_is_unique(cmd->stop_src);
 
         /* Step 2b : and mutually compatible */
 
@@ -670,21 +670,23 @@ static int ai_cmdtest(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 |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+        err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);
+        err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
-        if (cmd->convert_src == TRIG_TIMER)
-                err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
-                                                 board->ns_min);
-        else    /* TRIG_EXT */
-                err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+        if (cmd->convert_src == TRIG_TIMER) {
+                err |= comedi_check_trigger_arg_min(&cmd->convert_arg,
+                                                    board->ns_min);
+        } else {        /* TRIG_EXT */
+                err |= comedi_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->scan_end_arg,
+                                           cmd->chanlist_len);
 
         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;
@@ -695,7 +697,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 unsigned int 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)