Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / comedi / drivers / me4000.c

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index a03661ce34b509d4b9320075400cadb8c843781b..12481a032b9f16db2f4891411a6e2006524059c8 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -92,7 +92,7 @@ static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, me4000_pci_table);
 
-static const me4000_board_t me4000_boards[] = {
+static const struct me4000_board me4000_boards[] = {
        {"ME-4650", 0x4650, {0, 0}, {16, 0, 0, 0}, {4}, {0}},
 
        {"ME-4660", 0x4660, {0, 0}, {32, 0, 16, 0}, {4}, {3}},
@@ -113,14 +113,14 @@ static const me4000_board_t me4000_boards[] = {
        {0},
 };
 
-#define ME4000_BOARD_VERSIONS (sizeof(me4000_boards) / sizeof(me4000_board_t) - 1)
+#define ME4000_BOARD_VERSIONS (sizeof(me4000_boards) / sizeof(struct me4000_board) - 1)
 
 /*-----------------------------------------------------------------------------
   Comedi function prototypes
   ---------------------------------------------------------------------------*/
-static int me4000_attach(struct comedi_device *dev, comedi_devconfig *it);
+static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it);
 static int me4000_detach(struct comedi_device *dev);
-static comedi_driver driver_me4000 = {
+static struct comedi_driver driver_me4000 = {
       driver_name:"me4000",
       module : THIS_MODULE,
       attach : me4000_attach,
@@ -130,7 +130,7 @@ static comedi_driver driver_me4000 = {
 /*-----------------------------------------------------------------------------
   Meilhaus function prototypes
   ---------------------------------------------------------------------------*/
-static int me4000_probe(struct comedi_device *dev, comedi_devconfig *it);
+static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it);
 static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p);
 static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p);
 static int init_ao_context(struct comedi_device *dev);
@@ -141,10 +141,10 @@ static int xilinx_download(struct comedi_device *dev);
 static int reset_board(struct comedi_device *dev);
 
 static int me4000_dio_insn_bits(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 static int me4000_dio_insn_config(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 static int cnt_reset(struct comedi_device *dev, unsigned int channel);
 
@@ -152,49 +152,49 @@ static int cnt_config(struct comedi_device *dev,
        unsigned int channel, unsigned int mode);
 
 static int me4000_cnt_insn_config(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 static int me4000_cnt_insn_write(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 static int me4000_cnt_insn_read(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 static int me4000_ai_insn_read(struct comedi_device *dev,
-       comedi_subdevice *subdevice, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data);
 
-static int me4000_ai_cancel(struct comedi_device *dev, comedi_subdevice *s);
+static int me4000_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
 
 static int ai_check_chanlist(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_cmd *cmd);
+       struct comedi_subdevice *s, struct comedi_cmd *cmd);
 
 static int ai_round_cmd_args(struct comedi_device *dev,
-       comedi_subdevice *s,
-       comedi_cmd *cmd,
+       struct comedi_subdevice *s,
+       struct comedi_cmd *cmd,
        unsigned int *init_ticks,
        unsigned int *scan_ticks, unsigned int *chan_ticks);
 
 static int ai_prepare(struct comedi_device *dev,
-       comedi_subdevice *s,
-       comedi_cmd *cmd,
+       struct comedi_subdevice *s,
+       struct comedi_cmd *cmd,
        unsigned int init_ticks,
        unsigned int scan_ticks, unsigned int chan_ticks);
 
 static int ai_write_chanlist(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_cmd *cmd);
+       struct comedi_subdevice *s, struct comedi_cmd *cmd);
 
 static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG);
 
 static int me4000_ai_do_cmd_test(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_cmd *cmd);
+       struct comedi_subdevice *s, struct comedi_cmd *cmd);
 
-static int me4000_ai_do_cmd(struct comedi_device *dev, comedi_subdevice *s);
+static int me4000_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
 
 static int me4000_ao_insn_write(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 static int me4000_ao_insn_read(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data);
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);
 
 /*-----------------------------------------------------------------------------
   Meilhaus inline functions
@@ -230,7 +230,7 @@ static inline unsigned char me4000_inb(struct comedi_device *dev, unsigned long
        return value;
 }
 
-static const comedi_lrange me4000_ai_range = {
+static const struct comedi_lrange me4000_ai_range = {
        4,
        {
                        UNI_RANGE(2.5),
@@ -240,16 +240,16 @@ static const comedi_lrange me4000_ai_range = {
                }
 };
 
-static const comedi_lrange me4000_ao_range = {
+static const struct comedi_lrange me4000_ao_range = {
        1,
        {
                        BIP_RANGE(10),
                }
 };
 
-static int me4000_attach(struct comedi_device *dev, comedi_devconfig *it)
+static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        int result;
 
        CALL_PDEBUG("In me4000_attach()\n");
@@ -369,16 +369,16 @@ static int me4000_attach(struct comedi_device *dev, comedi_devconfig *it)
        return 0;
 }
 
-static int me4000_probe(struct comedi_device *dev, comedi_devconfig *it)
+static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct pci_dev *pci_device;
        int result, i;
-       me4000_board_t *board;
+       struct me4000_board *board;
 
        CALL_PDEBUG("In me4000_probe()\n");
 
        /* Allocate private memory */
-       if (alloc_private(dev, sizeof(me4000_info_t)) < 0)
+       if (alloc_private(dev, sizeof(struct me4000_info)) < 0)
                return -ENOMEM;
 
        /*
@@ -405,7 +405,7 @@ static int me4000_probe(struct comedi_device *dev, comedi_devconfig *it)
                                                }
                                        }
                                        dev->board_ptr = me4000_boards + i;
-                                       board = (me4000_board_t *) dev->
+                                       board = (struct me4000_board *) dev->
                                                board_ptr;
                                        info->pci_dev_p = pci_device;
                                        goto found;
@@ -914,7 +914,7 @@ static int me4000_detach(struct comedi_device *dev)
   ===========================================================================*/
 
 static int me4000_ai_insn_read(struct comedi_device *dev,
-       comedi_subdevice *subdevice, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data)
 {
 
        int chan = CR_CHAN(insn->chanspec);
@@ -1037,7 +1037,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
        return 1;
 }
 
-static int me4000_ai_cancel(struct comedi_device *dev, comedi_subdevice *s)
+static int me4000_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        unsigned long tmp;
 
@@ -1055,7 +1055,7 @@ static int me4000_ai_cancel(struct comedi_device *dev, comedi_subdevice *s)
 }
 
 static int ai_check_chanlist(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_cmd *cmd)
+       struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
        int aref;
        int i;
@@ -1136,8 +1136,8 @@ static int ai_check_chanlist(struct comedi_device *dev,
 }
 
 static int ai_round_cmd_args(struct comedi_device *dev,
-       comedi_subdevice *s,
-       comedi_cmd *cmd,
+       struct comedi_subdevice *s,
+       struct comedi_cmd *cmd,
        unsigned int *init_ticks,
        unsigned int *scan_ticks, unsigned int *chan_ticks)
 {
@@ -1223,8 +1223,8 @@ static void ai_write_timer(struct comedi_device *dev,
 }
 
 static int ai_prepare(struct comedi_device *dev,
-       comedi_subdevice *s,
-       comedi_cmd *cmd,
+       struct comedi_subdevice *s,
+       struct comedi_cmd *cmd,
        unsigned int init_ticks,
        unsigned int scan_ticks, unsigned int chan_ticks)
 {
@@ -1292,7 +1292,7 @@ static int ai_prepare(struct comedi_device *dev,
 }
 
 static int ai_write_chanlist(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_cmd *cmd)
+       struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
        unsigned int entry;
        unsigned int chan;
@@ -1331,13 +1331,13 @@ static int ai_write_chanlist(struct comedi_device *dev,
        return 0;
 }
 
-static int me4000_ai_do_cmd(struct comedi_device *dev, comedi_subdevice *s)
+static int me4000_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        int err;
        unsigned int init_ticks = 0;
        unsigned int scan_ticks = 0;
        unsigned int chan_ticks = 0;
-       comedi_cmd *cmd = &s->async->cmd;
+       struct comedi_cmd *cmd = &s->async->cmd;
 
        CALL_PDEBUG("In me4000_ai_do_cmd()\n");
 
@@ -1376,7 +1376,7 @@ static int me4000_ai_do_cmd(struct comedi_device *dev, comedi_subdevice *s)
  * So I tried to adopt this scheme.
  */
 static int me4000_ai_do_cmd_test(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_cmd *cmd)
+       struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
 
        unsigned int init_ticks;
@@ -1744,8 +1744,8 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG)
 {
        unsigned int tmp;
        struct comedi_device *dev = dev_id;
-       comedi_subdevice *s = dev->subdevices;
-       me4000_ai_context_t *ai_context = &info->ai_context;
+       struct comedi_subdevice *s = dev->subdevices;
+       struct me4000_ai_context *ai_context = &info->ai_context;
        int i;
        int c = 0;
        long lval;
@@ -1904,7 +1904,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG)
   ===========================================================================*/
 
 static int me4000_ao_insn_write(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
 
        int chan = CR_CHAN(insn->chanspec);
@@ -1962,7 +1962,7 @@ static int me4000_ao_insn_write(struct comedi_device *dev,
 }
 
 static int me4000_ao_insn_read(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
        int chan = CR_CHAN(insn->chanspec);
 
@@ -1983,7 +1983,7 @@ static int me4000_ao_insn_read(struct comedi_device *dev,
   ===========================================================================*/
 
 static int me4000_dio_insn_bits(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
 
        CALL_PDEBUG("In me4000_dio_insn_bits()\n");
@@ -2034,7 +2034,7 @@ static int me4000_dio_insn_bits(struct comedi_device *dev,
 }
 
 static int me4000_dio_insn_config(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
        unsigned long tmp;
        int chan = CR_CHAN(insn->chanspec);
@@ -2216,7 +2216,7 @@ static int cnt_config(struct comedi_device *dev, unsigned int channel,
 }
 
 static int me4000_cnt_insn_config(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
 
        int err;
@@ -2259,7 +2259,7 @@ static int me4000_cnt_insn_config(struct comedi_device *dev,
 }
 
 static int me4000_cnt_insn_read(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
 
        unsigned short tmp;
@@ -2306,7 +2306,7 @@ static int me4000_cnt_insn_read(struct comedi_device *dev,
 }
 
 static int me4000_cnt_insn_write(struct comedi_device *dev,
-       comedi_subdevice *s, comedi_insn *insn, unsigned int *data)
+       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
 
        unsigned short tmp;