From 07600725059e1a1f6d27b1a310dfc73244f4afb3 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 3 Sep 2014 13:45:51 +0100 Subject: [PATCH] staging: comedi: das1800: 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/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 951292d2c6c5..9d0150d44d76 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c @@ -731,15 +731,15 @@ static unsigned int burst_convert_arg(unsigned int convert_arg, int flags) convert_arg = 64000; /* the conversion time must be an integral number of microseconds */ - switch (flags & TRIG_ROUND_MASK) { - case TRIG_ROUND_NEAREST: + switch (flags & CMDF_ROUND_MASK) { + case CMDF_ROUND_NEAREST: default: micro_sec = (convert_arg + 500) / 1000; break; - case TRIG_ROUND_DOWN: + case CMDF_ROUND_DOWN: micro_sec = convert_arg / 1000; break; - case TRIG_ROUND_UP: + case CMDF_ROUND_UP: micro_sec = (convert_arg - 1) / 1000 + 1; break; } -- 2.34.1