openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: adl_pci9111: remove pci9111_software_trigger macro 

This macro relies on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten dev 2012-09-10 19:02:20 -07:00 committed by Greg Kroah-Hartman
parent 9676437345
commit 3eb60d7309
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/adl_pci9111.c
View File

@ -101,7 +101,7 @@ a multiple of chanlist_len*convert_arg.
#define PCI9111_RANGE_STATUS_REG 0x08
#define PCI9111_REGISTER_TRIGGER_MODE_CONTROL 0x0A
#define PCI9111_REGISTER_AD_MODE_INTERRUPT_READBACK 0x0A
#define PCI9111_REGISTER_SOFTWARE_TRIGGER 0x0E
#define PCI9111_SOFTWARE_TRIGGER_REG 0x0E
#define PCI9111_REGISTER_INTERRUPT_CONTROL 0x0C
#define PCI9111_8254_BASE_REG 0x40
#define PCI9111_REGISTER_INTERRUPT_CLEAR 0x48
@ -149,9 +149,6 @@ a multiple of chanlist_len*convert_arg.
#define pci9111_interrupt_clear() \
outb(0, dev->iobase + PCI9111_REGISTER_INTERRUPT_CLEAR)
#define pci9111_software_trigger() \
outb(0, dev->iobase + PCI9111_REGISTER_SOFTWARE_TRIGGER)
#define pci9111_fifo_reset() do { \
outb(PCI9111_FFEN_SET_FIFO_ENABLE, \
dev->iobase + PCI9111_REGISTER_INTERRUPT_CONTROL); \
@ -853,7 +850,8 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
pci9111_fifo_reset();
for (i = 0; i < insn->n; i++) {
pci9111_software_trigger();
/* Generate a software trigger */
outb(0, dev->iobase + PCI9111_SOFTWARE_TRIGGER_REG);
timeout = PCI9111_AI_INSTANT_READ_TIMEOUT;