]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: s626: use CMDF_ROUND_...
authorIan Abbott <abbotti@mev.co.uk>
Wed, 3 Sep 2014 12:46:00 +0000 (13:46 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:50:16 +0000 (13:50 -0700)
Replace use of the `TRIG_ROUND_...` macros with the new names
`CMDF_ROUND_...`.  The numeric values are unchanged.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/s626.c

index a868d73f86a3311f8ba9d417585f61f2507a0c8f..051a727a87e9769bde93d17da39e5d226b971845 100644 (file)
@@ -1967,15 +1967,15 @@ static int s626_ns_to_timer(unsigned int *nanosec, unsigned int flags)
 
        base = 500;             /* 2MHz internal clock */
 
-       switch (flags & TRIG_ROUND_MASK) {
-       case TRIG_ROUND_NEAREST:
+       switch (flags & CMDF_ROUND_MASK) {
+       case CMDF_ROUND_NEAREST:
        default:
                divider = (*nanosec + base / 2) / base;
                break;
-       case TRIG_ROUND_DOWN:
+       case CMDF_ROUND_DOWN:
                divider = (*nanosec) / base;
                break;
-       case TRIG_ROUND_UP:
+       case CMDF_ROUND_UP:
                divider = (*nanosec + base - 1) / base;
                break;
        }