From 28d3ddb47c26b9ce8957c6949efbf57c75df6400 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten dev Date: Mon, 10 Sep 2012 19:02:20 -0700 Subject: [PATCH] --- yaml --- r: 325138 b: refs/heads/master c: 3eb60d7309043831d8d345bd7fc32459598ade8c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci9111.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1cc186450fcb..9125584a0669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 967643734582396275efd6183c2b95786993231c +refs/heads/master: 3eb60d7309043831d8d345bd7fc32459598ade8c diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index ad683a78f3fc..78c3a89bfdd6 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -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;