diff options
| author | H Hartley Sweeten dev <hartleys@visionengravers.com> | 2012-09-11 02:02:20 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 03:08:01 (GMT) |
| commit | 3eb60d7309043831d8d345bd7fc32459598ade8c (patch) | |
| tree | 3a5b7d2a6d40b659875da37ba6b652fe89e8d573 /drivers | |
| parent | 967643734582396275efd6183c2b95786993231c (diff) | |
| download | linux-3eb60d7309043831d8d345bd7fc32459598ade8c.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9111.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index ad683a7..78c3a89 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -101,7 +101,7 @@ TODO: #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 @@ TODO: #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; |