staging: comedi: ni_pcidio: 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 <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index b5b36af802058e90b8c24e39cecdc8ab93317141..ede8e4117ab3aafdf9eabbd0ace5a2ff5e5c081e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -530,15 +530,15 @@ static int ni_pcidio_ns_to_timer(int *nanosec, unsigned int flags)
 
        base = TIMER_BASE;
 
-       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;
        }
@@ -669,7 +669,7 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                writeb(3, dev->mmio + LinePolarities);
                writeb(0xc0, dev->mmio + AckSer);
                writel(ni_pcidio_ns_to_timer(&cmd->scan_begin_arg,
-                                            TRIG_ROUND_NEAREST),
+                                            CMDF_ROUND_NEAREST),
                       dev->mmio + StartDelay);
                writeb(1, dev->mmio + ReqDelay);
                writeb(1, dev->mmio + ReqNotDelay);