mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 18:25:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ni_labpc_common: use CMDF_ROUND_...

Browse Source 
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>
This commit is contained in:
Ian Abbott
2014-09-03 13:45:56 +01:00
committed by Greg Kroah-Hartman
parent b544bd69cb
commit 2d9773b68a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/ni_labpc_common.c
View File

@@ -397,21 +397,21 @@ static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd,
base_period = I8254_OSC_BASE_2MHZ * devpriv->divisor_b0;
/* set a0 for conversion frequency and b1 for scan frequency */
switch (cmd->flags & TRIG_ROUND_MASK) {
switch (cmd->flags & CMDF_ROUND_MASK) {
default:
case TRIG_ROUND_NEAREST:
case CMDF_ROUND_NEAREST:
devpriv->divisor_a0 =
(convert_period + (base_period / 2)) / base_period;
devpriv->divisor_b1 =
(scan_period + (base_period / 2)) / base_period;
break;
case TRIG_ROUND_UP:
case CMDF_ROUND_UP:
devpriv->divisor_a0 =
(convert_period + (base_period - 1)) / base_period;
devpriv->divisor_b1 =
(scan_period + (base_period - 1)) / base_period;
break;
case TRIG_ROUND_DOWN:
case CMDF_ROUND_DOWN:
devpriv->divisor_a0 = convert_period / base_period;
devpriv->divisor_b1 = scan_period / base_period;
break;