From 1e00dedc5e1ee79e929891da386900e346a7519e Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 3 Sep 2014 13:45:54 +0100 Subject: [PATCH] staging: comedi: me4000: use CMDF_ROUND_... Replace use of the `TRIG_ROUND_...` macros with the new names `CMDF_ROUND_...`. The numeric values are unchanged. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/me4000.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 5b74b36da139..3b0df6b6502c 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -650,10 +650,10 @@ static int ai_round_cmd_args(struct comedi_device *dev, *init_ticks = (cmd->start_arg * 33) / 1000; rest = (cmd->start_arg * 33) % 1000; - if ((cmd->flags & TRIG_ROUND_MASK) == TRIG_ROUND_NEAREST) { + if ((cmd->flags & CMDF_ROUND_MASK) == CMDF_ROUND_NEAREST) { if (rest > 33) (*init_ticks)++; - } else if ((cmd->flags & TRIG_ROUND_MASK) == TRIG_ROUND_UP) { + } else if ((cmd->flags & CMDF_ROUND_MASK) == CMDF_ROUND_UP) { if (rest) (*init_ticks)++; } @@ -663,10 +663,10 @@ static int ai_round_cmd_args(struct comedi_device *dev, *scan_ticks = (cmd->scan_begin_arg * 33) / 1000; rest = (cmd->scan_begin_arg * 33) % 1000; - if ((cmd->flags & TRIG_ROUND_MASK) == TRIG_ROUND_NEAREST) { + if ((cmd->flags & CMDF_ROUND_MASK) == CMDF_ROUND_NEAREST) { if (rest > 33) (*scan_ticks)++; - } else if ((cmd->flags & TRIG_ROUND_MASK) == TRIG_ROUND_UP) { + } else if ((cmd->flags & CMDF_ROUND_MASK) == CMDF_ROUND_UP) { if (rest) (*scan_ticks)++; } @@ -676,10 +676,10 @@ static int ai_round_cmd_args(struct comedi_device *dev, *chan_ticks = (cmd->convert_arg * 33) / 1000; rest = (cmd->convert_arg * 33) % 1000; - if ((cmd->flags & TRIG_ROUND_MASK) == TRIG_ROUND_NEAREST) { + if ((cmd->flags & CMDF_ROUND_MASK) == CMDF_ROUND_NEAREST) { if (rest > 33) (*chan_ticks)++; - } else if ((cmd->flags & TRIG_ROUND_MASK) == TRIG_ROUND_UP) { + } else if ((cmd->flags & CMDF_ROUND_MASK) == CMDF_ROUND_UP) { if (rest) (*chan_ticks)++; } @@ -849,7 +849,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev, int err = 0; /* Only rounding flags are implemented */ - cmd->flags &= TRIG_ROUND_NEAREST | TRIG_ROUND_UP | TRIG_ROUND_DOWN; + cmd->flags &= CMDF_ROUND_NEAREST | CMDF_ROUND_UP | CMDF_ROUND_DOWN; /* Round the timer arguments */ ai_round_cmd_args(dev, s, cmd, &init_ticks, &scan_ticks, &chan_ticks); -- 2.39.5