From a28f42f3eb2dc2ab53d240c58503cffc0fd165ad Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 3 Sep 2014 13:45:37 +0100 Subject: [PATCH] staging: comedi: das1800: use CMDF_WAKE_EOS Replace use of `TRIG_WAKE_EOS` command flag with the new name `CMDF_WAKE_EOS`. The numeric value is unchanged. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/das1800.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index f9e4f72..951292d2c 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c @@ -1088,14 +1088,14 @@ static int das1800_ai_do_cmd(struct comedi_device *dev, struct comedi_async *async = s->async; const struct comedi_cmd *cmd = &async->cmd; - /* disable dma on TRIG_WAKE_EOS, or CMDF_PRIORITY + /* disable dma on CMDF_WAKE_EOS, or CMDF_PRIORITY * (because dma in handler is unsafe at hard real-time priority) */ - if (cmd->flags & (TRIG_WAKE_EOS | CMDF_PRIORITY)) + if (cmd->flags & (CMDF_WAKE_EOS | CMDF_PRIORITY)) devpriv->irq_dma_bits &= ~DMA_ENABLED; else devpriv->irq_dma_bits |= devpriv->dma_bits; - /* interrupt on end of conversion for TRIG_WAKE_EOS */ - if (cmd->flags & TRIG_WAKE_EOS) { + /* interrupt on end of conversion for CMDF_WAKE_EOS */ + if (cmd->flags & CMDF_WAKE_EOS) { /* interrupt fifo not empty */ devpriv->irq_dma_bits &= ~FIMD; } else { -- 2.7.4