From 0d5e03079de3332b9c3dbb5be24631502d0d676b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 12 Aug 2015 13:25:49 -0700 Subject: [PATCH] staging: comedi: hwdrv_apci3501: remove "magic" numbers in apci3501_write_insn_timer() Use register bit defines from addi_tcw.h to remove the "magic" numbers. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index c4a72a5b343f..d971f7a0926f 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c @@ -93,17 +93,17 @@ static int apci3501_write_insn_timer(struct comedi_device *dev, if (devpriv->timer_mode == ADDIDATA_WATCHDOG || devpriv->timer_mode == ADDIDATA_TIMER) { ctrl = inl(devpriv->tcw + ADDI_TCW_CTRL_REG); - ctrl &= 0xfffff9ff; + ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG); if (data[1] == 1) { /* enable */ - ctrl |= 0x1; + ctrl |= ADDI_TCW_CTRL_ENA; } else if (data[1] == 0) { /* stop */ if (devpriv->timer_mode == ADDIDATA_WATCHDOG) ctrl = 0; else - ctrl &= ~0x1; + ctrl &= ~ADDI_TCW_CTRL_ENA; } else if (data[1] == 2) { /* trigger */ - ctrl |= 0x200; + ctrl |= ADDI_TCW_CTRL_TRIG; } outl(ctrl, devpriv->tcw + ADDI_TCW_CTRL_REG); } -- 2.20.1