From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:48 +0000 (+0100) Subject: staging: comedi: adl_pci9118: use CMDF_ROUND_... X-Git-Tag: firefly_0821_release~176^2~3121^2~721 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed23e413bd2614f3fc767e1cd1250ff3a677f857;p=firefly-linux-kernel-4.4.55.git staging: comedi: adl_pci9118: 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/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 3e16b5f06efe..b71b0cf041c4 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -761,7 +761,7 @@ static void pci9118_calc_divisors(char mode, struct comedi_device *dev, *tim2 = this_board->ai_ns_min; i8253_cascade_ns_to_timer(I8254_OSC_BASE_4MHZ, div1, div2, - tim2, flags & TRIG_ROUND_NEAREST); + tim2, flags & CMDF_ROUND_NEAREST); break; case 2: if (*tim2 < this_board->ai_ns_min)