staging: comedi: adl_pci9118: 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>

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index eb4a528..fb3043d 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -82,7 +82,6 @@
 
 #include "amcc_s5933.h"
 #include "comedi_8254.h"
-#include "comedi_fc.h"
 
 #define IORANGE_9118   64      /* I hope */
 #define PCI9118_CHANLEN        255     /*
@@ -1174,21 +1173,21 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
 
        /* Step 1 : check if triggers are trivially valid */
 
-       err |= cfc_check_trigger_src(&cmd->start_src,
+       err |= comedi_check_trigger_src(&cmd->start_src,
                                        TRIG_NOW | TRIG_EXT | TRIG_INT);
 
        flags = TRIG_FOLLOW;
        if (devpriv->master)
                flags |= TRIG_TIMER | TRIG_EXT;
-       err |= cfc_check_trigger_src(&cmd->scan_begin_src, flags);
+       err |= comedi_check_trigger_src(&cmd->scan_begin_src, flags);
 
        flags = TRIG_TIMER | TRIG_EXT;
        if (devpriv->master)
                flags |= TRIG_NOW;
-       err |= cfc_check_trigger_src(&cmd->convert_src, flags);
+       err |= comedi_check_trigger_src(&cmd->convert_src, flags);
 
-       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->scan_end_src, TRIG_COUNT);
+       err |= comedi_check_trigger_src(&cmd->stop_src,
                                        TRIG_COUNT | TRIG_NONE | TRIG_EXT);
 
        if (err)
@@ -1196,10 +1195,10 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
 
        /* 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->convert_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->convert_src);
+       err |= comedi_check_trigger_is_unique(cmd->stop_src);
 
        /* Step 2b : and mutually compatible */
 
@@ -1228,7 +1227,7 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
        switch (cmd->start_src) {
        case TRIG_NOW:
        case TRIG_EXT:
-               err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+               err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);
                break;
        case TRIG_INT:
                /* start_arg is the internal trigger (any value) */
@@ -1236,7 +1235,7 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
        }
 
        if (cmd->scan_begin_src & (TRIG_FOLLOW | TRIG_EXT))
-               err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+               err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
 
        if ((cmd->scan_begin_src == TRIG_TIMER) &&
            (cmd->convert_src == TRIG_TIMER) && (cmd->scan_end_arg == 1)) {
@@ -1245,34 +1244,37 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
                cmd->scan_begin_arg = 0;
        }
 
-       if (cmd->scan_begin_src == TRIG_TIMER)
-               err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
-                                                devpriv->ai_ns_min);
+       if (cmd->scan_begin_src == TRIG_TIMER) {
+               err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                   devpriv->ai_ns_min);
+       }
 
-       if (cmd->scan_begin_src == TRIG_EXT)
+       if (cmd->scan_begin_src == TRIG_EXT) {
                if (cmd->scan_begin_arg) {
                        cmd->scan_begin_arg = 0;
                        err |= -EINVAL;
-                       err |= cfc_check_trigger_arg_max(&cmd->scan_end_arg,
-                                                        65535);
+                       err |= comedi_check_trigger_arg_max(&cmd->scan_end_arg,
+                                                           65535);
                }
+       }
 
-       if (cmd->convert_src & (TRIG_TIMER | TRIG_NOW))
-               err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
-                                                devpriv->ai_ns_min);
+       if (cmd->convert_src & (TRIG_TIMER | TRIG_NOW)) {
+               err |= comedi_check_trigger_arg_min(&cmd->convert_arg,
+                                                   devpriv->ai_ns_min);
+       }
 
        if (cmd->convert_src == TRIG_EXT)
-               err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+               err |= comedi_check_trigger_arg_is(&cmd->convert_arg, 0);
 
        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);
 
-       err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
+       err |= comedi_check_trigger_arg_min(&cmd->chanlist_len, 1);
 
-       err |= cfc_check_trigger_arg_min(&cmd->scan_end_arg,
-                                        cmd->chanlist_len);
+       err |= comedi_check_trigger_arg_min(&cmd->scan_end_arg,
+                                           cmd->chanlist_len);
 
        if ((cmd->scan_end_arg % cmd->chanlist_len)) {
                cmd->scan_end_arg =
@@ -1288,13 +1290,13 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
        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 | TRIG_NOW)) {
                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 (cmd->scan_begin_src == TRIG_TIMER &&
                    cmd->convert_src == TRIG_NOW) {
@@ -1304,8 +1306,9 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
                        } else {
                                arg = cmd->convert_arg * cmd->chanlist_len;
                        }
-                       err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
-                                                        arg);
+                       err |= comedi_check_trigger_arg_min(&cmd->
+                                                           scan_begin_arg,
+                                                           arg);
                }
        }