Staging: comedi: pcmcia irq fixes

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / das6402.c

diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index 950f07a..92487f5 100644 (file)
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -38,6 +38,7 @@ Devices: [Keithley Metrabyte] DAS6402 (das6402)
 This driver has suffered bitrot.
 */
 
+#include <linux/interrupt.h>
 #include "../comedidev.h"
 
 #include <linux/ioport.h>
@@ -98,7 +99,8 @@ This driver has suffered bitrot.
 #define        C2 0x80
 #define        RWLH 0x30
 
-static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it);
+static int das6402_attach(struct comedi_device *dev,
+                         struct comedi_devconfig *it);
 static int das6402_detach(struct comedi_device *dev);
 static struct comedi_driver driver_das6402 = {
        .driver_name = "das6402",
@@ -116,7 +118,8 @@ struct das6402_private {
 };
 #define devpriv ((struct das6402_private *)dev->private)
 
-static void das6402_ai_fifo_dregs(struct comedi_device *dev, struct comedi_subdevice *s);
+static void das6402_ai_fifo_dregs(struct comedi_device *dev,
+                                 struct comedi_subdevice *s);
 
 static void das6402_setcounter(struct comedi_device *dev)
 {
@@ -162,7 +165,7 @@ static irqreturn_t intr_handler(int irq, void *d)
        }
 #ifdef DEBUG
        printk("das6402: interrupt! das6402_irqcount=%i\n",
-               devpriv->das6402_irqcount);
+              devpriv->das6402_irqcount);
        printk("das6402: iobase+2=%i\n", inw_p(dev->iobase + 2));
 #endif
 
@@ -173,7 +176,7 @@ static irqreturn_t intr_handler(int irq, void *d)
                outb(0x07, dev->iobase + 8);    /* clears all flip-flops */
 #ifdef DEBUG
                printk("das6402: Got %i samples\n\n",
-                       devpriv->das6402_wordsread - diff);
+                      devpriv->das6402_wordsread - diff);
 #endif
                s->async->events |= COMEDI_CB_EOA;
                comedi_event(dev, s);
@@ -195,7 +198,8 @@ static void das6402_ai_fifo_read(struct comedi_device *dev, short *data, int n)
 }
 #endif
 
-static void das6402_ai_fifo_dregs(struct comedi_device *dev, struct comedi_subdevice *s)
+static void das6402_ai_fifo_dregs(struct comedi_device *dev,
+                                 struct comedi_subdevice *s)
 {
        while (1) {
                if (!(inb(dev->iobase + 8) & 0x01))
@@ -204,7 +208,8 @@ static void das6402_ai_fifo_dregs(struct comedi_device *dev, struct comedi_subde
        }
 }
 
-static int das6402_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
+static int das6402_ai_cancel(struct comedi_device *dev,
+                            struct comedi_subdevice *s)
 {
        /*
         *  This function should reset the board from whatever condition it
@@ -226,8 +231,8 @@ static int das6402_ai_cancel(struct comedi_device *dev, struct comedi_subdevice
 }
 
 #ifdef unused
-static int das6402_ai_mode2(struct comedi_device *dev, struct comedi_subdevice *s,
-       comedi_trig *it)
+static int das6402_ai_mode2(struct comedi_device *dev,
+                           struct comedi_subdevice *s, comedi_trig * it)
 {
        devpriv->das6402_ignoreirq = 1;
 
@@ -292,14 +297,15 @@ static int board_init(struct comedi_device *dev)
 static int das6402_detach(struct comedi_device *dev)
 {
        if (dev->irq)
-               comedi_free_irq(dev->irq, dev);
+               free_irq(dev->irq, dev);
        if (dev->iobase)
                release_region(dev->iobase, DAS6402_SIZE);
 
        return 0;
 }
 
-static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+static int das6402_attach(struct comedi_device *dev,
+                         struct comedi_devconfig *it)
 {
        unsigned int irq;
        unsigned long iobase;
@@ -324,7 +330,7 @@ static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it
 
        irq = it->options[0];
        printk(" ( irq = %u )", irq);
-       ret = comedi_request_irq(irq, intr_handler, 0, "das6402", dev);
+       ret = request_irq(irq, intr_handler, 0, "das6402", dev);
        if (ret < 0) {
                printk("irq conflict\n");
                return ret;