From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:56 +0000 (+0100) Subject: staging: comedi: ni_labpc_common: use CMDF_ROUND_... X-Git-Tag: firefly_0821_release~176^2~3121^2~713 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2d9773b68a216c4db58d021c4b08208daeddc5f3;p=firefly-linux-kernel-4.4.55.git staging: comedi: ni_labpc_common: 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_labpc_common.c b/drivers/staging/comedi/drivers/ni_labpc_common.c index 1881510ae97a..c54c88db4200 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;