staging: comedi, remove interrupt.h

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / comedi / rt.c

diff --git a/drivers/staging/comedi/rt.c b/drivers/staging/comedi/rt.c
index e9f5777595aba90a0f294fa2a369b810036bc5d8..ace360d4a492c4b75bda7027f1e45be83489f7aa 100644 (file)
--- a/drivers/staging/comedi/rt.c
+++ b/drivers/staging/comedi/rt.c
@@ -27,6 +27,7 @@
 #include <linux/comedidev.h>
 
 #include <linux/errno.h>
+#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/fcntl.h>
@@ -54,7 +55,7 @@
 struct comedi_irq_struct {
        int rt;
        int irq;
-        irqreturn_t(*handler) (int irq, void *dev_id PT_REGS_ARG);
+       irq_handler_t handler;
        unsigned long flags;
        const char *device;
        struct comedi_device *dev_id;
@@ -65,9 +66,8 @@ static int comedi_rt_release_irq(struct comedi_irq_struct *it);
 
 static struct comedi_irq_struct *comedi_irqs[NR_IRQS];
 
-int comedi_request_irq(unsigned irq, irqreturn_t(*handler) (int,
-               void *PT_REGS_ARG), unsigned long flags, const char *device,
-       struct comedi_device *dev_id)
+int comedi_request_irq(unsigned irq, irq_handler_t handler, unsigned long flags,
+               const char *device, struct comedi_device *dev_id)
 {
        struct comedi_irq_struct *it;
        int ret;
@@ -191,7 +191,7 @@ static void handle_void_irq(int irq)
                rt_printk("comedi: null irq struct?\n");
                return;
        }
-       it->handler(irq, it->dev_id PT_REGS_NULL);
+       it->handler(irq, it->dev_id);
        rt_enable_irq(irq);     /* needed by rtai-adeos, seems like it shouldn't hurt earlier versions */
 }
 
@@ -307,7 +307,7 @@ static void fusion_handle_irq(unsigned int irq, void *cookie)
 {
        struct comedi_irq_struct *it = cookie;
 
-       it->handler(irq, it->dev_id PT_REGS_NULL);
+       it->handler(irq, it->dev_id);
        rthal_irq_enable(irq);
 }
 
@@ -340,14 +340,14 @@ void comedi_rt_cleanup(void)
 /* RTLinux section */
 #ifdef CONFIG_COMEDI_RTL
 
-static unsigned int handle_rtl_irq(unsigned int irq PT_REGS_ARG)
+static unsigned int handle_rtl_irq(unsigned int irq)
 {
        struct comedi_irq_struct *it;
 
        it = comedi_irqs[irq];
        if (it == NULL)
                return 0;
-       it->handler(irq, it->dev_id PT_REGS_NULL);
+       it->handler(irq, it->dev_id);
        rtl_hard_enable_irq(irq);
        return 0;
 }