From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:47 +0000 (+0100) Subject: staging: comedi: addi_apci_3xxx: use CMDF_ROUND_... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=74eede61acaa6881b9d9a733d904a314768f3eb7;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: addi_apci_3xxx: 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/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index 57e6f889d73f..f26e4eccac14 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -496,15 +496,15 @@ static int apci3xxx_ai_ns_to_timer(struct comedi_device *dev, break; } - switch (flags & TRIG_ROUND_MASK) { - case TRIG_ROUND_NEAREST: + switch (flags & CMDF_ROUND_MASK) { + case CMDF_ROUND_NEAREST: default: timer = (*ns + base / 2) / base; break; - case TRIG_ROUND_DOWN: + case CMDF_ROUND_DOWN: timer = *ns / base; break; - case TRIG_ROUND_UP: + case CMDF_ROUND_UP: timer = (*ns + base - 1) / base; break; }