staging: comedi: quatech_daqp_cs: 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, 23 insertions, 20 deletions

diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index aa8653465771..152cb146fc16 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -52,7 +52,6 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 #include <linux/completion.h>
 
 #include "../comedi_pcmcia.h"
-#include "comedi_fc.h"
 
 struct daqp_private {
         int stop;
@@ -365,22 +364,22 @@ static int daqp_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,
+        err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW);
+        err |= comedi_check_trigger_src(&cmd->scan_begin_src,
                                         TRIG_TIMER | TRIG_FOLLOW);
-        err |= cfc_check_trigger_src(&cmd->convert_src,
+        err |= comedi_check_trigger_src(&cmd->convert_src,
                                         TRIG_TIMER | 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->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 */
 
@@ -389,13 +388,14 @@ static int daqp_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);
 
 #define MAX_SPEED       10000   /* 100 kHz - in nanoseconds */
 
-        if (cmd->scan_begin_src == TRIG_TIMER)
-                err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
-                                                 MAX_SPEED);
+        if (cmd->scan_begin_src == TRIG_TIMER) {
+                err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                    MAX_SPEED);
+        }
 
         /* If both scan_begin and convert are both timer values, the only
          * way that can make sense is if the scan time is the number of
@@ -407,15 +407,18 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,
                 err |= -EINVAL;
         }
 
-        if (cmd->convert_src == TRIG_TIMER)
-                err |= cfc_check_trigger_arg_min(&cmd->convert_arg, MAX_SPEED);
+        if (cmd->convert_src == TRIG_TIMER) {
+                err |= comedi_check_trigger_arg_min(&cmd->convert_arg,
+                                                    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_max(&cmd->stop_arg, 0x00ffffff);
+                err |= comedi_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
         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;
@@ -425,13 +428,13 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,
         if (cmd->scan_begin_src == TRIG_TIMER) {
                 arg = cmd->scan_begin_arg;
                 daqp_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 (cmd->convert_src == TRIG_TIMER) {
                 arg = cmd->convert_arg;
                 daqp_ns_to_timer(&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)