shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: remove APCI3120_DISABLE_TIMER_INT

Browse Source 
For aesthetics, remove this define and just use ~APCI3120_ENABLE_TIMER_INT.

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>
This commit is contained in:
H Hartley Sweeten
2014-11-04 10:54:20 -07:00
committed by Greg Kroah-Hartman
parent b6eb21d6df
commit 604f8e10b5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@@ -108,7 +108,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
#define APCI3120_TIMER_DISABLE 0
#define APCI3120_TIMER_ENABLE 1
#define APCI3120_ENABLE_TIMER_INT 0x04
#define APCI3120_DISABLE_TIMER_INT (~APCI3120_ENABLE_TIMER_INT)
#define APCI3120_WRITE_MODE_SELECT 0x0e
#define APCI3120_RD_STATUS 0x02
@@ -1037,7 +1036,7 @@ static irqreturn_t apci3120_interrupt(int irq, void *d)
default:
/* disable Timer Interrupt */
devpriv->mode &= APCI3120_DISABLE_TIMER_INT;
devpriv->mode &= ~APCI3120_ENABLE_TIMER_INT;
outb(devpriv->mode,
dev->iobase + APCI3120_WRITE_MODE_SELECT);
}
@@ -1093,7 +1092,7 @@ static int apci3120_config_insn_timer(struct comedi_device *dev,
apci3120_timer_enable(dev, 2, false);
/* Disable TIMER Interrupt */
devpriv->mode &= APCI3120_DISABLE_TIMER_INT &
devpriv->mode &= ~APCI3120_ENABLE_TIMER_INT &
~APCI3120_ENABLE_TIMER_COUNTER;
/* Disable Eoc and Eos Interrupts */
@@ -1179,7 +1178,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev,
/* save the task structure to pass info to user */
devpriv->tsk_Current = current;
} else {
devpriv->mode &= APCI3120_DISABLE_TIMER_INT;
devpriv->mode &= ~APCI3120_ENABLE_TIMER_INT;
}
outb(devpriv->mode, dev->iobase + APCI3120_WRITE_MODE_SELECT);
@@ -1197,7 +1196,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev,
devpriv->mode &= ~APCI3120_ENABLE_WATCHDOG;
}
/* Disable timer interrupt */
devpriv->mode &= APCI3120_DISABLE_TIMER_INT;
devpriv->mode &= ~APCI3120_ENABLE_TIMER_INT;
outb(devpriv->mode, dev->iobase + APCI3120_WRITE_MODE_SELECT);
apci3120_timer_enable(dev, 2, false);