From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:46 +0000 (+0100) Subject: staging: comedi: 8253.h: use CMDF_ROUND_... X-Git-Tag: firefly_0821_release~176^2~3121^2~723 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a512e418e5921b25e88acd07f41d0a04ff7fc74;p=firefly-linux-kernel-4.4.55.git staging: comedi: 8253.h: 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/8253.h b/drivers/staging/comedi/drivers/8253.h index f8e1ebad304d..9f4c1411719d 100644 --- a/drivers/staging/comedi/drivers/8253.h +++ b/drivers/staging/comedi/drivers/8253.h @@ -90,8 +90,8 @@ static inline void i8253_cascade_ns_to_timer(int i8253_osc_base, } } - switch (flags & TRIG_ROUND_MASK) { - case TRIG_ROUND_NEAREST: + switch (flags & CMDF_ROUND_MASK) { + case CMDF_ROUND_NEAREST: default: ns_high = div1_lub * div2_lub * i8253_osc_base; ns_low = div1_glb * div2_glb * i8253_osc_base; @@ -103,11 +103,11 @@ static inline void i8253_cascade_ns_to_timer(int i8253_osc_base, div2 = div2_glb; } break; - case TRIG_ROUND_UP: + case CMDF_ROUND_UP: div1 = div1_lub; div2 = div2_lub; break; - case TRIG_ROUND_DOWN: + case CMDF_ROUND_DOWN: div1 = div1_glb; div2 = div2_glb; break;