From c93d2f94d5e363280a84e6932a000610c09c72a3 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Tue, 5 Aug 2003 03:32:30 +0000 Subject: [PATCH] Change IRQ_HANDLED to 1 when used as an rvalue --- comedi/drivers/adl_pci9111.c | 2 +- comedi/drivers/adv_pci1710.c | 2 +- comedi/drivers/amplc_pc236.c | 2 +- comedi/drivers/amplc_pci230.c | 2 +- comedi/drivers/cb_pcidas.c | 2 +- comedi/drivers/cb_pcidas64.c | 2 +- comedi/drivers/ni_pcidio.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c index 7bdb3571..aadfd32d 100644 --- a/comedi/drivers/adl_pci9111.c +++ b/comedi/drivers/adl_pci9111.c @@ -932,7 +932,7 @@ static irqreturn_t pci9111_interrupt (int irq, unsigned long irq_flags; int i, data; int resolution = ((pci9111_board_struct *) dev->board_ptr)->ai_resolution; - int retval = IRQ_HANDLED; + int retval = 1; async = subdevice->async; diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c index fbee3e37..0d7a0c8f 100644 --- a/comedi/drivers/adv_pci1710.c +++ b/comedi/drivers/adv_pci1710.c @@ -619,7 +619,7 @@ static void interrupt_pci1710_half_fifo(void *d) static irqreturn_t interrupt_service_pci1710(int irq, void *d, struct pt_regs *regs) { comedi_device *dev = d; - int retval = IRQ_HANDLED; + int retval = 1; DPRINTK("adv_pci1710 EDBG: BGN: interrupt_service_pci1710(%d,...)\n",irq); if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ)) // is this interrupt from our board? diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c index 2b97cba9..fd7231d7 100644 --- a/comedi/drivers/amplc_pc236.c +++ b/comedi/drivers/amplc_pc236.c @@ -540,7 +540,7 @@ static irqreturn_t pc236_interrupt(int irq,void *d,struct pt_regs *regs) { comedi_device *dev=d; comedi_subdevice *s=dev->subdevices+1; - int retval = IRQ_HANDLED; + int retval = 1; if(!pc236_intr_check(dev)) return IRQ_RETVAL(retval); diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c index 886f2611..bb721d7e 100644 --- a/comedi/drivers/amplc_pci230.c +++ b/comedi/drivers/amplc_pci230.c @@ -1128,7 +1128,7 @@ static irqreturn_t pci230_interrupt(int irq, void *d, struct pt_regs *regs) int status_int; comedi_device *dev = (comedi_device*) d; comedi_subdevice *s; - int retval = IRQ_HANDLED; + int retval = 1; /* Read interrupt status/enable register. */ status_int = inb(devpriv->pci_iobase + PCI230_INT_SCE); diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c index 9be515fc..3f5d938a 100644 --- a/comedi/drivers/cb_pcidas.c +++ b/comedi/drivers/cb_pcidas.c @@ -1516,7 +1516,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d, struct pt_regs *regs) unsigned int num_samples, i; static const int timeout = 10000; unsigned long flags; - int retval = IRQ_HANDLED; + int retval = 1; if(dev->attached == 0) { diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c index 73909473..a9ca1658 100644 --- a/comedi/drivers/cb_pcidas64.c +++ b/comedi/drivers/cb_pcidas64.c @@ -2578,7 +2578,7 @@ static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs) uint32_t plx_bits; uint8_t dma0_status, dma1_status; unsigned long flags; - int retval = IRQ_HANDLED; + int retval = 1; plx_status = readl(priv(dev)->plx9080_iobase + PLX_INTRCS_REG); status = readw(priv(dev)->main_iobase + HW_STATUS_REG); diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c index c01b5963..e82c7181 100644 --- a/comedi/drivers/ni_pcidio.c +++ b/comedi/drivers/ni_pcidio.c @@ -399,7 +399,7 @@ static irqreturn_t nidio_interrupt(int irq, void *d, struct pt_regs *regs) int status; int work = 0; unsigned int m_status; - int retval = IRQ_HANDLED; + int retval = 1; status = readb(dev->iobase+Interrupt_And_Window_Status); flags = readb(dev->iobase+Group_1_Flags); -- 2.26.2