diff options
| author |   Ian Abbott <abbotti@mev.co.uk> | 2014-09-03 13:46:00 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 13:50:16 -0700 |
| commit | 889277b93b3d94e8166554eb06c6ae0543a3a3ef (patch) | |
| tree | 323644be7a5d9e83cdf6c3cf779830835e4136ee /drivers/staging/comedi/drivers/s626.c | |
| parent | staging: comedi: rtd520: use CMDF_ROUND_... (diff) | |
| download | linux-dev-889277b93b3d94e8166554eb06c6ae0543a3a3ef.tar.xz linux-dev-889277b93b3d94e8166554eb06c6ae0543a3a3ef.zip | |
staging: comedi: s626: 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/s626.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index a868d73f86a3..051a727a87e9 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -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; } |