staging: comedi, remove interrupt.h

[pandora-kernel.git] / drivers / staging / comedi / drivers / ni_6527.c

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 18fb799..b32833e 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -84,11 +84,13 @@ static struct comedi_driver driver_ni6527 = {
       detach:ni6527_detach,
 };
 
-typedef struct {
+struct ni6527_board {
+
        int dev_id;
        const char *name;
-} ni6527_board;
-static const ni6527_board ni6527_boards[] = {
+};
+
+static const struct ni6527_board ni6527_boards[] = {
        {
              dev_id:   0x2b20,
              name:     "pci-6527",
@@ -100,7 +102,7 @@ static const ni6527_board ni6527_boards[] = {
 };
 
 #define n_ni6527_boards (sizeof(ni6527_boards)/sizeof(ni6527_boards[0]))
-#define this_board ((const ni6527_board *)dev->board_ptr)
+#define this_board ((const struct ni6527_board *)dev->board_ptr)
 
 static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
        {PCI_VENDOR_ID_NATINST, 0x2b10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -110,12 +112,13 @@ static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, ni6527_pci_table);
 
-typedef struct {
+struct ni6527_private {
        struct mite_struct *mite;
        unsigned int filter_interval;
        unsigned int filter_enable;
-} ni6527_private;
-#define devpriv ((ni6527_private *)dev->private)
+};
+
+#define devpriv ((struct ni6527_private *)dev->private)
 
 static int ni6527_find_device(struct comedi_device * dev, int bus, int slot);
 
@@ -209,7 +212,7 @@ static int ni6527_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi
        return 2;
 }
 
-static irqreturn_t ni6527_interrupt(int irq, void *d PT_REGS_ARG)
+static irqreturn_t ni6527_interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
        struct comedi_subdevice *s = dev->subdevices + 2;
@@ -368,7 +371,7 @@ static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * i
 
        printk("comedi%d: ni6527:", dev->minor);
 
-       if ((ret = alloc_private(dev, sizeof(ni6527_private))) < 0)
+       if ((ret = alloc_private(dev, sizeof(struct ni6527_private))) < 0)
                return ret;
 
        ret = ni6527_find_device(dev, it->options[0], it->options[1]);