From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:52 +0000 (+0100) Subject: staging: comedi: dt282x: use CMDF_ROUND_... X-Git-Tag: firefly_0821_release~176^2~3121^2~717 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ba81e62d9934d072a77c01cd7715eed0816b5c53;p=firefly-linux-kernel-4.4.55.git staging: comedi: dt282x: 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 --- diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index b98969154c6a..4017fcbe641a 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c @@ -403,15 +403,15 @@ static unsigned int dt282x_ns_to_timer(unsigned int *ns, unsigned int flags) if (prescale == 1) continue; base = 250 * (1 << prescale); - switch (flags & TRIG_ROUND_MASK) { - case TRIG_ROUND_NEAREST: + switch (flags & CMDF_ROUND_MASK) { + case CMDF_ROUND_NEAREST: default: divider = (*ns + base / 2) / base; break; - case TRIG_ROUND_DOWN: + case CMDF_ROUND_DOWN: divider = (*ns) / base; break; - case TRIG_ROUND_UP: + case CMDF_ROUND_UP: divider = (*ns + base - 1) / base; break; }