Change IRQ_HANDLED to 1 when used as an rvalue

diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c
index 7bdb357108ece5b33e1046cb78322daf0d6fc094..aadfd32d9c009303601d8d89ccd721839d5ecf95 100644 (file)
--- 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 fbee3e373f74a800672bff4210312eb4fdb620ff..0d7a0c8fbcf08606dc746a60ead30eabfb6da9ef 100644 (file)
--- 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 2b97cba9c46d2d3f3cd72c162890a73090a727e3..fd7231d75e5256f1093fb91fefb1cc35f43b4754 100644 (file)
--- 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 886f26118d6c5c0fe233c3cd0988ea6c3b0da52a..bb721d7e2aff7412ebba0842b926d1d0dc3ed6f2 100644 (file)
--- 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 9be515fcde96aae4cca56cec00464152f7a3cca9..3f5d938a0237e734a6758a7766306f38d12ba87b 100644 (file)
--- 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 7390947311d8ea304c3965ae6e9ab0726143c185..a9ca16582607acd8ad109a5b78c4200a7788ecf4 100644 (file)
--- 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 c01b596398993ca0d6338f48314282fa27a9aaa6..e82c71810551600cb3f14f4e78fe3e0dc7fc3d42 100644 (file)
--- 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);