diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2014-09-03 13:45:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 13:50:16 -0700 |
| commit | b302b8be957f73a9a59b46bf3982c70bbd737c6c (patch) | |
| tree | 30ca7b75578c5f0581cf93b67a3f20e5d7abf085 /drivers/staging/comedi/drivers/ni_pcidio.c | |
| parent | 3280c2d2a6a345848384b9de0c8ed76db6ad0c79 (diff) | |
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_pcidio.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcidio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index b5b36af80205..ede8e4117ab3 100644 --- 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); |