From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:38 +0000 (+0100) Subject: staging: comedi: ni_labpc_common: use CMDF_WAKE_EOS X-Git-Tag: firefly_0821_release~176^2~3121^2~731 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=82d5571b1f11482ee305a5490a185bef38a88631;p=firefly-linux-kernel-4.4.55.git staging: comedi: ni_labpc_common: use CMDF_WAKE_EOS 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_labpc_common.c b/drivers/staging/comedi/drivers/ni_labpc_common.c index 5238a98e20bb..1881510ae97a 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_common.c +++ b/drivers/staging/comedi/drivers/ni_labpc_common.c @@ -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;