Commit b302b8be authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3280c2d2
...@@ -530,15 +530,15 @@ static int ni_pcidio_ns_to_timer(int *nanosec, unsigned int flags) ...@@ -530,15 +530,15 @@ static int ni_pcidio_ns_to_timer(int *nanosec, unsigned int flags)
base = TIMER_BASE; base = TIMER_BASE;
switch (flags & TRIG_ROUND_MASK) { switch (flags & CMDF_ROUND_MASK) {
case TRIG_ROUND_NEAREST: case CMDF_ROUND_NEAREST:
default: default:
divider = (*nanosec + base / 2) / base; divider = (*nanosec + base / 2) / base;
break; break;
case TRIG_ROUND_DOWN: case CMDF_ROUND_DOWN:
divider = (*nanosec) / base; divider = (*nanosec) / base;
break; break;
case TRIG_ROUND_UP: case CMDF_ROUND_UP:
divider = (*nanosec + base - 1) / base; divider = (*nanosec + base - 1) / base;
break; break;
} }
...@@ -669,7 +669,7 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -669,7 +669,7 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
writeb(3, dev->mmio + LinePolarities); writeb(3, dev->mmio + LinePolarities);
writeb(0xc0, dev->mmio + AckSer); writeb(0xc0, dev->mmio + AckSer);
writel(ni_pcidio_ns_to_timer(&cmd->scan_begin_arg, writel(ni_pcidio_ns_to_timer(&cmd->scan_begin_arg,
TRIG_ROUND_NEAREST), CMDF_ROUND_NEAREST),
dev->mmio + StartDelay); dev->mmio + StartDelay);
writeb(1, dev->mmio + ReqDelay); writeb(1, dev->mmio + ReqDelay);
writeb(1, dev->mmio + ReqNotDelay); writeb(1, dev->mmio + ReqNotDelay);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment