]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
staging: comedi: ni_labpc_common: use CMDF_WAKE_EOS
authorIan Abbott <abbotti@mev.co.uk>
Wed, 3 Sep 2014 12:45:38 +0000 (13:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:50:14 +0000 (13:50 -0700)
Replace use of `TRIG_WAKE_EOS` command flag with the new name
`CMDF_WAKE_EOS`.  The numeric value is the same.

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>
drivers/staging/comedi/drivers/ni_labpc_common.c

index 5238a98e20bbfe5bd68e9c15234736e2bbed7f23..1881510ae97a43b138110a4f809f59bc02302c53 100644 (file)
@@ -689,13 +689,13 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        /* figure out what method we will use to transfer data */
        if (labpc_have_dma_chan(dev) &&
            /* dma unsafe at RT priority,
-            * and too much setup time for TRIG_WAKE_EOS */
-           (cmd->flags & (TRIG_WAKE_EOS | CMDF_PRIORITY)) == 0)
+            * and too much setup time for CMDF_WAKE_EOS */
+           (cmd->flags & (CMDF_WAKE_EOS | CMDF_PRIORITY)) == 0)
                xfer = isa_dma_transfer;
        else if (/* pc-plus has no fifo-half full interrupt */
                 board->is_labpc1200 &&
                 /* wake-end-of-scan should interrupt on fifo not empty */
-                (cmd->flags & TRIG_WAKE_EOS) == 0 &&
+                (cmd->flags & CMDF_WAKE_EOS) == 0 &&
                 /* make sure we are taking more than just a few points */
                 (cmd->stop_src != TRIG_COUNT || devpriv->count > 256))
                xfer = fifo_half_full_transfer;