lkml.org 
[lkml]   [2014]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 33/37] staging: comedi: ni_labpc_common: use CMDF_ROUND_...
Date
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>
---
drivers/staging/comedi/drivers/ni_labpc_common.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_labpc_common.c b/drivers/staging/comedi/drivers/ni_labpc_common.c
index 1881510..c54c88d 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_common.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_common.c
@@ -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;
--
2.1.0


\
 
 \ /
  Last update: 2014-09-03 15:21    [W:0.301 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site