diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-08-12 13:25:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-14 18:36:18 -0700 |
| commit | 0d5e03079de3332b9c3dbb5be24631502d0d676b (patch) | |
| tree | 5850eafd42dd356dd340402a2c37d33edaf84a50 /drivers/staging/comedi | |
| parent | 7dc68e350460c4c1620f79f23be70739845994ff (diff) | |
| download | linux-0d5e03079de3332b9c3dbb5be24631502d0d676b.tar.bz2 | |
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c | 8 |
1 files 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); } |