From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:28 +0000 (+0100) Subject: staging: comedi: ni_labpc_common: use CMDF_PRIORITY X-Git-Tag: firefly_0821_release~176^2~3121^2~741 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ae5857aa2888cb5e33b235ef6d94012296700e1;p=firefly-linux-kernel-4.4.55.git staging: comedi: ni_labpc_common: use CMDF_PRIORITY Replace use of `TRIG_RT` command flag with the equivalent flag `CMDF_PRIORITY`. The numeric value is unchanged. 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 9e76a363784e..5238a98e20bb 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_common.c +++ b/drivers/staging/comedi/drivers/ni_labpc_common.c @@ -690,7 +690,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 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 | TRIG_RT)) == 0) + (cmd->flags & (TRIG_WAKE_EOS | CMDF_PRIORITY)) == 0) xfer = isa_dma_transfer; else if (/* pc-plus has no fifo-half full interrupt */ board->is_labpc1200 &&