[PATCH] irqs: various char drivers

Fix up a bunch of char drivers for the new IRQ API.

diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 5d9504421a53936cfb9c9cc870991680d834ee44..23e81fbe829d229aa8d512a8e16890d2b7797f34 100644 (file)
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -108,7 +108,7 @@ static ssize_t ac_read (struct file *, char *, size_t, loff_t *);
 static ssize_t ac_write (struct file *, const char *, size_t, loff_t *);
 static int ac_ioctl(struct inode *, struct file *, unsigned int,
                    unsigned long);
-static void ac_interrupt(int, void *, struct pt_regs *);
+static irqreturn_t ac_interrupt(int, void *, struct pt_regs *);
 
 static struct file_operations ac_fops = {
        .owner = THIS_MODULE,
@@ -606,11 +606,12 @@ static ssize_t ac_read (struct file *filp, char *buf, size_t count, loff_t *ptr)
        } 
 }
 
-static void ac_interrupt(int vec, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t ac_interrupt(int vec, void *dev_instance, struct pt_regs *regs)
 {
        unsigned int i;
        unsigned int FlagInt;
        unsigned int LoopCount;
+       int handled = 0;
 
        //    printk("Applicom interrupt on IRQ %d occurred\n", vec);
 
@@ -632,6 +633,7 @@ static void ac_interrupt(int vec, void *dev_instance, struct pt_regs *regs)
                                continue;
                        }
 
+                       handled = 1;
                        FlagInt = 1;
                        writeb(0, apbs[i].RamIO + RAM_IT_TO_PC);
 
@@ -675,6 +677,7 @@ static void ac_interrupt(int vec, void *dev_instance, struct pt_regs *regs)
                else
                        LoopCount++;
        } while(LoopCount < 2);
+       return IRQ_RETVAL(handled);
 }
 
 

diff --git a/drivers/char/drm/mga_irq.c b/drivers/char/drm/mga_irq.c
index 28e9a262dabf738aad2f4ff5837e9df290efecc6..7f510b6dafad16bdf1d5871c2648983af5ce3cd0 100644 (file)
--- a/drivers/char/drm/mga_irq.c
+++ b/drivers/char/drm/mga_irq.c
@@ -36,7 +36,7 @@
 #include "mga_drm.h"
 #include "mga_drv.h"
 
-void mga_dma_service( DRM_IRQ_ARGS )
+irqreturn_t mga_dma_service( DRM_IRQ_ARGS )
 {
        drm_device_t *dev = (drm_device_t *) arg;
        drm_mga_private_t *dev_priv = 
@@ -51,7 +51,9 @@ void mga_dma_service( DRM_IRQ_ARGS )
                atomic_inc(&dev->vbl_received);
                DRM_WAKEUP(&dev->vbl_queue);
                DRM(vbl_send_signals)( dev );
+               return IRQ_HANDLED;
        }
+       return IRQ_NONE;
 }
 
 int mga_vblank_wait(drm_device_t *dev, unsigned int *sequence)

diff --git a/drivers/char/drm/r128_irq.c b/drivers/char/drm/r128_irq.c
index bfc30405d4fd25d81d9b367dc8fd0750ffb73697..c0a7a2811b4c604c14ff50a8ad786b48c7ee064b 100644 (file)
--- a/drivers/char/drm/r128_irq.c
+++ b/drivers/char/drm/r128_irq.c
@@ -36,7 +36,7 @@
 #include "r128_drm.h"
 #include "r128_drv.h"
 
-void r128_dma_service( DRM_IRQ_ARGS )
+irqreturn_t r128_dma_service( DRM_IRQ_ARGS )
 {
        drm_device_t *dev = (drm_device_t *) arg;
        drm_r128_private_t *dev_priv = 
@@ -51,7 +51,9 @@ void r128_dma_service( DRM_IRQ_ARGS )
                atomic_inc(&dev->vbl_received);
                DRM_WAKEUP(&dev->vbl_queue);
                DRM(vbl_send_signals)( dev );
+               return IRQ_HANDLED;
        }
+       return IRQ_NONE;
 }
 
 int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)

diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c
index 99e4b8fb8b7bbe9d62a6177fdf7ca48482087aeb..c5d72f3683fbc835bc742381e3d653803eda84ed 100644 (file)
--- a/drivers/char/ftape/lowlevel/fdc-io.c
+++ b/drivers/char/ftape/lowlevel/fdc-io.c
@@ -1298,18 +1298,21 @@ static int fdc_config(void)
        TRACE_EXIT 0;
 }
 
-static void ftape_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ftape_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        void (*handler) (void) = *fdc.hook;
+       int handled = 0;
        TRACE_FUN(ft_t_any);
 
        *fdc.hook = NULL;
        if (handler) {
+               handled = 1;
                handler();
        } else {
                TRACE(ft_t_bug, "Unexpected ftape interrupt");
        }
        TRACE_EXIT;
+       return IRQ_RETVAL(handled);
 }
 
 int fdc_grab_irq_and_dma(void)

diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
index 3cafb99963b0311be97fcaf52491cf8c8698cc99..373173de50a0eb5135d27f32e2c058a0d509e531 100644 (file)
--- a/drivers/char/mwave/tp3780i.c
+++ b/drivers/char/mwave/tp3780i.c
@@ -96,13 +96,14 @@ static void EnableSRAM(THINKPAD_BD_DATA * pBDData)
 }
 
 
-static void UartInterrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t UartInterrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        PRINTK_3(TRACE_TP3780I,
                "tp3780i::UartInterrupt entry irq %x dev_id %x\n", irq, (int) dev_id);
+       return IRQ_HANDLED;
 }
 
-static void DspInterrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t DspInterrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;
        DSP_3780I_CONFIG_SETTINGS *pSettings = &pDrvData->rBDData.rDspSettings;
@@ -150,6 +151,7 @@ static void DspInterrupt(int irq, void *dev_id, struct pt_regs *regs)
                        "tp3780i::DspInterrupt, return false from dsp3780i_GetIPCSource\n");
        }
        PRINTK_1(TRACE_TP3780I, "tp3780i::DspInterrupt exit\n");
+       return IRQ_HANDLED;
 }
 
 

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 343a4c425ffeb1da829025e27cdd8efa3696db62..b113391019aee364697896ae311b3ac3fdc15cf0 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -305,7 +305,7 @@ static void sonypi_setbluetoothpower(u8 state) {
 }
 
 /* Interrupt handler: some event is available */
-void sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
+static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
        u8 v1, v2, event = 0;
        int i, j;
 
@@ -334,7 +334,7 @@ void sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) {
        if (verbose)
                printk(KERN_WARNING 
                       "sonypi: unknown event port1=0x%02x,port2=0x%02x\n",v1,v2);
-       return;
+       return IRQ_NONE;
 
 found:
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
@@ -354,6 +354,7 @@ found:
        }
 #endif /* CONFIG_INPUT || CONFIG_INPUT_MODULE */
        sonypi_pushq(event);
+       return IRQ_HANDLED;
 }
 
 /* External camera command (exported to the motion eye v4l driver) */