staging: comedi: ni_labpc_common: use CMDF_ROUND_...
authorIan Abbott <abbotti@mev.co.uk>
Wed, 3 Sep 2014 12:45:56 +0000 (13:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Sep 2014 20:50:15 +0000 (13:50 -0700)
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>
drivers/staging/comedi/drivers/ni_labpc_common.c

index 1881510ae97a43b138110a4f809f59bc02302c53..c54c88db42001e534fa163f40e1d91e199811ece 100644 (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;