diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:54:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:02 -0800 |
| commit | 76931af2009ef8e81fd30addf42a39d0265c45f5 (patch) | |
| tree | 56bb485b42e6b8e17b8ac2cb302efe8f786255cb | |
| parent | e451dfeb4c205f74b3bfc35d58fd1a17dff490ed (diff) | |
staging: comedi: addi_apci_3120: remove APCI3120_{ENABLE,DISABLE}
These true/false defines don't add any significant clarity to the code.
Remove them.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 6377c37fde16..4760200ca1e0 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -71,9 +71,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY /* for transfer count enable bit */ #define AGCSTS_TC_ENABLE 0x10000000 -#define APCI3120_DISABLE 0 -#define APCI3120_ENABLE 1 - #define APCI3120_START 1 #define APCI3120_STOP 0 @@ -407,7 +404,7 @@ static int apci3120_cyclic_ai(int mode, cmd->flags); } - if (devpriv->b_ExttrigEnable == APCI3120_ENABLE) + if (devpriv->b_ExttrigEnable) apci3120_exttrig_enable(dev, true); switch (mode) { @@ -438,7 +435,7 @@ static int apci3120_cyclic_ai(int mode, outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG); /* If DMA is disabled */ - if (devpriv->us_UseDma == APCI3120_DISABLE) { + if (!devpriv->us_UseDma) { /* disable EOC and enable EOS */ devpriv->b_InterruptMode = APCI3120_EOS_MODE; @@ -462,15 +459,14 @@ static int apci3120_cyclic_ai(int mode, outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG); devpriv->b_Timer2Mode = APCI3120_COUNTER; - devpriv->b_Timer2Interrupt = APCI3120_ENABLE; + devpriv->b_Timer2Interrupt = 1; } } else { devpriv->b_InterruptMode = APCI3120_DMA_MODE; apci3120_setup_dma(dev, s); } - if (devpriv->us_UseDma == APCI3120_DISABLE && - cmd->stop_src == TRIG_COUNT) + if (!devpriv->us_UseDma && cmd->stop_src == TRIG_COUNT) apci3120_timer_enable(dev, 2, true); switch (mode) { @@ -498,9 +494,9 @@ static int apci3120_ai_cmd(struct comedi_device *dev, struct comedi_cmd *cmd = &s->async->cmd; if (cmd->start_src == TRIG_EXT) - devpriv->b_ExttrigEnable = APCI3120_ENABLE; + devpriv->b_ExttrigEnable = 1; else - devpriv->b_ExttrigEnable = APCI3120_DISABLE; + devpriv->b_ExttrigEnable = 0; if (cmd->scan_begin_src == TRIG_FOLLOW) return apci3120_cyclic_ai(1, dev, s); @@ -656,9 +652,9 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) outl(int_amcc | 0x00ff0000, devpriv->amcc + AMCC_OP_REG_INTCSR); - if (devpriv->b_ExttrigEnable == APCI3120_ENABLE) { + if (devpriv->b_ExttrigEnable) { apci3120_exttrig_enable(dev, false); - devpriv->b_ExttrigEnable = APCI3120_DISABLE; + devpriv->b_ExttrigEnable = 0; } apci3120_clr_timer2_interrupt(dev); @@ -841,7 +837,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev, } /* enable disable interrupt */ - if ((devpriv->b_Timer2Interrupt) == APCI3120_ENABLE) { + if (devpriv->b_Timer2Interrupt) { devpriv->mode |= APCI3120_MODE_TIMER2_IRQ_ENA; /* save the task structure to pass info to user */ |