Commit 3eb60d73 authored by H Hartley Sweeten dev's avatar H Hartley Sweeten dev Committed by Greg Kroah-Hartman
Browse files

staging: comedi: adl_pci9111: remove pci9111_software_trigger macro 



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

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96764373

drivers/staging/comedi/drivers/adl_pci9111.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE