Fixed compiler warnings about unused variable in the interrupt handler

when building for 2.4 kernel.

diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c
index cb07eaffc12e2e86e58b624f6dc99a974c0e41bd..a147bf5fa4e006117fcc933c3dc4348150c5555c 100644 (file)
--- a/comedi/drivers/adl_pci9111.c
+++ b/comedi/drivers/adl_pci9111.c
@@ -956,7 +956,6 @@ pci9111_interrupt (int irq, void *p_device, struct pt_regs *regs)
        comedi_subdevice *subdevice = dev->read_subdev;
        comedi_async *async;
        unsigned long irq_flags;
-       int handled = 1;
 
        async = subdevice->async;
 
@@ -976,7 +975,7 @@ pci9111_interrupt (int irq, void *p_device, struct pt_regs *regs)
                        async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
                        comedi_event (dev, subdevice, async->events);
 
-                       return IRQ_RETVAL(handled);
+                       return IRQ_HANDLED;
                }
 
                if (pci9111_is_fifo_half_full())
@@ -1049,7 +1048,7 @@ pci9111_interrupt (int irq, void *p_device, struct pt_regs *regs)
 
        comedi_event (dev, subdevice, async->events);
 
-       return IRQ_RETVAL(handled);
+       return IRQ_HANDLED;
 }
 
 // ------------------------------------------------------------------

diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c
index 2ee39c2764a95adcc488ad88df8942b623def861..eed2315ac35da65d15788295a48f2fa21b1175c6 100644 (file)
--- a/comedi/drivers/adv_pci1710.c
+++ b/comedi/drivers/adv_pci1710.c
@@ -718,7 +718,6 @@ 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 = 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?
@@ -738,7 +737,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d, struct pt_regs *r
                outw(devpriv->CntrlReg, dev->iobase+PCI171x_CONTROL);
                // start pacer
                start_pacer(dev, 1, devpriv->ai_et_div1, devpriv->ai_et_div2);
-               return IRQ_RETVAL(retval);
+               return IRQ_HANDLED;
        }
        if (devpriv->ai_eos) {  // We use FIFO half full INT or not?
                interrupt_pci1710_every_sample(d);
@@ -746,7 +745,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d, struct pt_regs *r
                interrupt_pci1710_half_fifo(d);
        }
        DPRINTK("adv_pci1710 EDBG: END: interrupt_service_pci1710(...)\n");
-       return IRQ_RETVAL(retval);
+       return IRQ_HANDLED;
 }
 
 /*

diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c
index 398766a82d6b4cd713f56fe2796263f170a158fd..a0a7f658fb7cd16c5db8c6b8930744786a848524 100644 (file)
--- a/comedi/drivers/amplc_pc236.c
+++ b/comedi/drivers/amplc_pc236.c
@@ -539,15 +539,14 @@ 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 = 1;
+       int handled;
 
-       if(!pc236_intr_check(dev))
-               return IRQ_RETVAL(retval);
-
-       comedi_buf_put(s->async,0);
-       s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
-
-       comedi_event(dev,s,s->async->events);
-       return IRQ_RETVAL(retval);
+       handled = pc236_intr_check(dev);
+       if (handled) {
+               comedi_buf_put(s->async,0);
+               s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
+               comedi_event(dev,s,s->async->events);
+       }
+       return IRQ_RETVAL(handled);
 }
 

diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 8e4b4305cee1ea62a9f26bdd2bb3c84b5e24d704..24ab4770041973906d765609423e82cbec915114 100644 (file)
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -1402,7 +1402,6 @@ 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 = 1;
 
        /* Read interrupt status/enable register. */
        status_int = inb(devpriv->pci_iobase + PCI230_INT_SCE);
@@ -1439,7 +1438,7 @@ static irqreturn_t pci230_interrupt(int irq, void *d, struct pt_regs *regs)
                s->async->events = 0;
        }
 
-       return IRQ_RETVAL(retval);
+       return IRQ_HANDLED;
 }
 
 static void pci230_handle_ao(comedi_device *dev, comedi_subdevice *s) {

diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index 0dd7c5b51ec98e0cf5c847c88983a8840b37ab9a..8c573213de5e67001445ec3ee121705625401945 100644 (file)
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -1502,7 +1502,6 @@ 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 = 1;
 
        if(dev->attached == 0)
        {
@@ -1607,7 +1606,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d, struct pt_regs *regs)
 
        comedi_event(dev, s, async->events);
 
-       return IRQ_RETVAL(retval);
+       return IRQ_HANDLED;
 }
 
 static void handle_ao_interrupt(comedi_device *dev, unsigned int status)

diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index 8c4832e4b82e670cdc4ad4456b58258380976fff..68900bdb520bd77687bcec82d698db090282a5f9 100644 (file)
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -3050,7 +3050,6 @@ static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs)
        unsigned short status;
        uint32_t plx_status;
        uint32_t plx_bits;
-       int retval = 1;
 
        plx_status = readl(priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
        status = readw(priv(dev)->main_iobase + HW_STATUS_REG);
@@ -3079,7 +3078,7 @@ static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs)
 
        DEBUG_PRINT("exiting handler\n");
 
-       return IRQ_RETVAL( retval );
+       return IRQ_HANDLED;
 }
 
 void abort_dma(comedi_device *dev, unsigned int channel)

diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index 2e87988a01284c7d1edb24a99c273a4f05be3443..f04614d764eea7682c7fbfacbf347f4b966c1a13 100644 (file)
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -435,7 +435,6 @@ static irqreturn_t nidio_interrupt(int irq, void *d, struct pt_regs *regs)
        int status;
        int work = 0;
        unsigned int m_status;
-       int retval = 1;
 
        status = readb(devpriv->mite->daq_io_addr+Interrupt_And_Window_Status);
        flags = readb(devpriv->mite->daq_io_addr+Group_1_Flags);
@@ -580,7 +579,7 @@ out:
                writeb(0x03,devpriv->mite->daq_io_addr+Master_DMA_And_Interrupt_Control);
        }
 #endif
-       return IRQ_RETVAL(retval);
+       return IRQ_HANDLED;
 }
 
 #ifdef DEBUG_FLAGS