staging: comedi, remove interrupt.h

[pandora-kernel.git] / drivers / staging / comedi / drivers / addi-data / addi_common.c

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 618c69b..fcdfefb 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -72,8 +72,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 //Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module");
 //Update-0.7.57->0.7.68MODULE_LICENSE("GPL");
 
-#define devpriv ((addi_private *)dev->private)
-#define this_board ((boardtype *)dev->board_ptr)
+#define devpriv ((struct addi_private *)dev->private)
+#define this_board ((struct addi_board *)dev->board_ptr)
 
 #if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
 //BYTE b_SaveFPUReg [94];
@@ -219,7 +219,7 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
 
 MODULE_DEVICE_TABLE(pci, addi_apci_tbl);
 
-static const boardtype boardtypes[] = {
+static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_3120
        {"apci3120",
                        APCI3120_BOARD_VENDOR_ID,
@@ -2525,7 +2525,7 @@ static const boardtype boardtypes[] = {
 #endif
 };
 
-#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
+#define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board))
 
 struct comedi_driver driver_addi = {
       driver_name:"addi_common",
@@ -2534,7 +2534,7 @@ struct comedi_driver driver_addi = {
       detach:i_ADDI_Detach,
       num_names:n_boardtypes,
       board_name:&boardtypes[0].pc_DriverName,
-      offset:sizeof(boardtype),
+      offset:sizeof(struct addi_board),
 };
 
 COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
@@ -2563,7 +2563,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
 {
        struct comedi_subdevice *s;
        int ret, pages, i, n_subdevices;
-       DWORD dw_Dummy;
+       unsigned int dw_Dummy;
        resource_size_t io_addr[5];
        unsigned int irq;
        resource_size_t iobase_a, iobase_main, iobase_addon, iobase_reserved;
@@ -2575,7 +2575,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
        sprintf(c_Identifier, "Addi-Data GmbH Comedi %s",
                this_board->pc_DriverName);
 
-       if ((ret = alloc_private(dev, sizeof(addi_private))) < 0) {
+       if ((ret = alloc_private(dev, sizeof(struct addi_private))) < 0) {
                return -ENOMEM;
        }
 
@@ -2624,21 +2624,21 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
 
                dev->board_name = this_board->pc_DriverName;
                devpriv->amcc = card;
-               devpriv->iobase = (INT) dev->iobase;
-               devpriv->i_IobaseAmcc = (INT) iobase_a; //AMCC base address...
-               devpriv->i_IobaseAddon = (INT) iobase_addon;    //ADD ON base address....
-               devpriv->i_IobaseReserved = (INT) iobase_reserved;
+               devpriv->iobase = (int) dev->iobase;
+               devpriv->i_IobaseAmcc = (int) iobase_a; //AMCC base address...
+               devpriv->i_IobaseAddon = (int) iobase_addon;    //ADD ON base address....
+               devpriv->i_IobaseReserved = (int) iobase_reserved;
                devpriv->ps_BoardInfo = this_board;
        } else {
                dev->board_name = this_board->pc_DriverName;
                dev->iobase = (unsigned long)io_addr[2];
                devpriv->amcc = card;
-               devpriv->iobase = (INT) io_addr[2];
+               devpriv->iobase = (int) io_addr[2];
                devpriv->ps_BoardInfo = this_board;
-               devpriv->i_IobaseReserved = (INT) io_addr[3];
+               devpriv->i_IobaseReserved = (int) io_addr[3];
                printk("\nioremap begin");
                devpriv->dw_AiBase =
-                       (ULONG_PTR) ioremap(io_addr[3],
+                       (unsigned long ) ioremap(io_addr[3],
                        this_board->i_IorangeBase3);
                printk("\nioremap end");
        }
@@ -2662,7 +2662,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
                it->options[2]);
        dev->irq = irq;
 
-       // Read eepeom and fill boardtype Structure
+       // Read eepeom and fill addi_board Structure
 
        if (this_board->i_PCIEeprom) {
                printk("\nPCI Eeprom used");
@@ -3003,7 +3003,7 @@ static int i_ADDI_Reset(struct comedi_device * dev)
 /*
 +----------------------------------------------------------------------------+
 | Function name     :                                                        |
-|static void v_ADDI_Interrupt(int irq, void *d  PT_REGS_ARG)                 |
+|static void v_ADDI_Interrupt(int irq, void *d)                 |
 |                                                                                                               |
 +----------------------------------------------------------------------------+
 | Task              : Registerd interrupt routine                                                   |
@@ -3018,7 +3018,7 @@ static int i_ADDI_Reset(struct comedi_device * dev)
 +----------------------------------------------------------------------------+
 */
 
-static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG)
+static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
        this_board->v_hwdrv_Interrupt(irq, d);
@@ -3049,8 +3049,8 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG)
 static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, struct comedi_subdevice * s,
        struct comedi_insn * insn, unsigned int * data)
 {
-       WORD w_Data;
-       WORD w_Address;
+       unsigned short w_Data;
+       unsigned short w_Address;
        w_Address = CR_CHAN(insn->chanspec);    // address to be read as 0,1,2,3...255
 
        w_Data = w_EepromReadWord(devpriv->i_IobaseAmcc,