Staging: fix assorted typos all over the place
[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / das16.c
index 0219c32..10a87e6 100644 (file)
@@ -79,6 +79,7 @@ Computer boards manuals also available from their website www.measurementcomputi
 */
 
 #include <linux/pci.h>
+#include <linux/interrupt.h>
 #include <asm/dma.h>
 #include "../comedidev.h"
 
@@ -87,16 +88,16 @@ Computer boards manuals also available from their website www.measurementcomputi
 #include "comedi_fc.h"
 
 #undef DEBUG
-//#define DEBUG
+/* #define DEBUG */
 
 #ifdef DEBUG
-#define DEBUG_PRINT(format, args...) rt_printk("das16: " format, ## args)
+#define DEBUG_PRINT(format, args...) printk("das16: " format, ## args)
 #else
 #define DEBUG_PRINT(format, args...)
 #endif
 
-#define DAS16_SIZE 20          // number of ioports
-#define DAS16_DMA_SIZE 0xff00  // size in bytes of allocated dma buffer
+#define DAS16_SIZE 20          /*  number of ioports */
+#define DAS16_DMA_SIZE 0xff00  /*  size in bytes of allocated dma buffer */
 
 /*
     cio-das16.pdf
@@ -184,7 +185,7 @@ Computer boards manuals also available from their website www.measurementcomputi
 
 */
 
-static const int sample_size = 2;      // size in bytes of a sample from board
+static const int sample_size = 2;      /*  size in bytes of a sample from board */
 
 #define DAS16_TRIG             0
 #define DAS16_AI_LSB           0
@@ -237,61 +238,67 @@ static const int sample_size = 2; // size in bytes of a sample from board
 #define   DAS1600_CLK_10MHZ            0x01
 
 static const struct comedi_lrange range_das1x01_bip = { 4, {
-                       BIP_RANGE(10),
-                       BIP_RANGE(1),
-                       BIP_RANGE(0.1),
-                       BIP_RANGE(0.01),
-       }
+                                                           BIP_RANGE(10),
+                                                           BIP_RANGE(1),
+                                                           BIP_RANGE(0.1),
+                                                           BIP_RANGE(0.01),
+                                                           }
 };
+
 static const struct comedi_lrange range_das1x01_unip = { 4, {
-                       UNI_RANGE(10),
-                       UNI_RANGE(1),
-                       UNI_RANGE(0.1),
-                       UNI_RANGE(0.01),
-       }
+                                                            UNI_RANGE(10),
+                                                            UNI_RANGE(1),
+                                                            UNI_RANGE(0.1),
+                                                            UNI_RANGE(0.01),
+                                                            }
 };
+
 static const struct comedi_lrange range_das1x02_bip = { 4, {
-                       BIP_RANGE(10),
-                       BIP_RANGE(5),
-                       BIP_RANGE(2.5),
-                       BIP_RANGE(1.25),
-       }
+                                                           BIP_RANGE(10),
+                                                           BIP_RANGE(5),
+                                                           BIP_RANGE(2.5),
+                                                           BIP_RANGE(1.25),
+                                                           }
 };
+
 static const struct comedi_lrange range_das1x02_unip = { 4, {
-                       UNI_RANGE(10),
-                       UNI_RANGE(5),
-                       UNI_RANGE(2.5),
-                       UNI_RANGE(1.25),
-       }
+                                                            UNI_RANGE(10),
+                                                            UNI_RANGE(5),
+                                                            UNI_RANGE(2.5),
+                                                            UNI_RANGE(1.25),
+                                                            }
 };
+
 static const struct comedi_lrange range_das16jr = { 9, {
-                       // also used by 16/330
-                       BIP_RANGE(10),
-                       BIP_RANGE(5),
-                       BIP_RANGE(2.5),
-                       BIP_RANGE(1.25),
-                       BIP_RANGE(0.625),
-                       UNI_RANGE(10),
-                       UNI_RANGE(5),
-                       UNI_RANGE(2.5),
-                       UNI_RANGE(1.25),
-       }
+                                                       /*  also used by 16/330 */
+                                                       BIP_RANGE(10),
+                                                       BIP_RANGE(5),
+                                                       BIP_RANGE(2.5),
+                                                       BIP_RANGE(1.25),
+                                                       BIP_RANGE(0.625),
+                                                       UNI_RANGE(10),
+                                                       UNI_RANGE(5),
+                                                       UNI_RANGE(2.5),
+                                                       UNI_RANGE(1.25),
+                                                       }
 };
+
 static const struct comedi_lrange range_das16jr_16 = { 8, {
-                       BIP_RANGE(10),
-                       BIP_RANGE(5),
-                       BIP_RANGE(2.5),
-                       BIP_RANGE(1.25),
-                       UNI_RANGE(10),
-                       UNI_RANGE(5),
-                       UNI_RANGE(2.5),
-                       UNI_RANGE(1.25),
-       }
+                                                          BIP_RANGE(10),
+                                                          BIP_RANGE(5),
+                                                          BIP_RANGE(2.5),
+                                                          BIP_RANGE(1.25),
+                                                          UNI_RANGE(10),
+                                                          UNI_RANGE(5),
+                                                          UNI_RANGE(2.5),
+                                                          UNI_RANGE(1.25),
+                                                          }
 };
 
 static const int das16jr_gainlist[] = { 8, 0, 1, 2, 3, 4, 5, 6, 7 };
 static const int das16jr_16_gainlist[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
 static const int das1600_gainlist[] = { 0, 1, 2, 3 };
+
 enum {
        das16_pg_none = 0,
        das16_pg_16jr,
@@ -306,6 +313,7 @@ static const int *const das16_gainlists[] = {
        das1600_gainlist,
        das1600_gainlist,
 };
+
 static const struct comedi_lrange *const das16_ai_uni_lranges[] = {
        &range_unknown,
        &range_das16jr,
@@ -313,6 +321,7 @@ static const struct comedi_lrange *const das16_ai_uni_lranges[] = {
        &range_das1x01_unip,
        &range_das1x02_unip,
 };
+
 static const struct comedi_lrange *const das16_ai_bip_lranges[] = {
        &range_unknown,
        &range_das16jr,
@@ -326,40 +335,43 @@ struct munge_info {
        unsigned have_byte:1;
 };
 
-static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-
-static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_cmd * cmd);
-static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s);
-static int das16_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
-static void das16_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s,
-       void *array, unsigned int num_bytes, unsigned int start_chan_index);
-
-static void das16_reset(struct comedi_device * dev);
-static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG);
+static int das16_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data);
+static int das16_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data);
+static int das16_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data);
+static int das16_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data);
+
+static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_cmd *cmd);
+static int das16_cmd_exec(struct comedi_device *dev,
+                         struct comedi_subdevice *s);
+static int das16_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
+static void das16_ai_munge(struct comedi_device *dev,
+                          struct comedi_subdevice *s, void *array,
+                          unsigned int num_bytes,
+                          unsigned int start_chan_index);
+
+static void das16_reset(struct comedi_device *dev);
+static irqreturn_t das16_dma_interrupt(int irq, void *d);
 static void das16_timer_interrupt(unsigned long arg);
-static void das16_interrupt(struct comedi_device * dev);
+static void das16_interrupt(struct comedi_device *dev);
 
-static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns,
-       int flags);
-static int das1600_mode_detect(struct comedi_device * dev);
-static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
-       struct comedi_cmd cmd);
+static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns,
+                                   int flags);
+static int das1600_mode_detect(struct comedi_device *dev);
+static unsigned int das16_suggest_transfer_size(struct comedi_device *dev,
+                                               struct comedi_cmd cmd);
 
-static void reg_dump(struct comedi_device * dev);
+static void reg_dump(struct comedi_device *dev);
 
-typedef struct das16_board_struct {
+struct das16_board {
        const char *name;
        void *ai;
        unsigned int ai_nbits;
-       unsigned int ai_speed;  // max conversion speed in nanosec
+       unsigned int ai_speed;  /*  max conversion speed in nanosec */
        unsigned int ai_pg;
        void *ao;
        unsigned int ao_nbits;
@@ -371,343 +383,341 @@ typedef struct das16_board_struct {
 
        unsigned int size;
        unsigned int id;
-} das16_board;
+};
 
-static const struct das16_board_struct das16_boards[] = {
+static const struct das16_board das16_boards[] = {
        {
-             name:     "das-16",
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:15000,
-             ai_pg:    das16_pg_none,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x10,
-             i8254_offset:0x0c,
-             size:     0x14,
-             id:       0x00,
-               },
+        .name = "das-16",
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 15000,
+        .ai_pg = das16_pg_none,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x10,
+        .i8254_offset = 0x0c,
+        .size = 0x14,
+        .id = 0x00,
+        },
        {
-             name:     "das-16g",
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:15000,
-             ai_pg:    das16_pg_none,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x10,
-             i8254_offset:0x0c,
-             size:     0x14,
-             id:       0x00,
-               },
+        .name = "das-16g",
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 15000,
+        .ai_pg = das16_pg_none,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x10,
+        .i8254_offset = 0x0c,
+        .size = 0x14,
+        .id = 0x00,
+        },
        {
-             name:     "das-16f",
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:8500,
-             ai_pg:    das16_pg_none,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x10,
-             i8254_offset:0x0c,
-             size:     0x14,
-             id:       0x00,
-               },
+        .name = "das-16f",
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 8500,
+        .ai_pg = das16_pg_none,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x10,
+        .i8254_offset = 0x0c,
+        .size = 0x14,
+        .id = 0x00,
+        },
        {
-             name:     "cio-das16",    // cio-das16.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:20000,
-             ai_pg:    das16_pg_none,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x10,
-             i8254_offset:0x0c,
-             size:     0x14,
-             id:       0x80,
-               },
+        .name = "cio-das16",   /*  cio-das16.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 20000,
+        .ai_pg = das16_pg_none,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x10,
+        .i8254_offset = 0x0c,
+        .size = 0x14,
+        .id = 0x80,
+        },
        {
-             name:     "cio-das16/f",  // das16.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_none,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x10,
-             i8254_offset:0x0c,
-             size:     0x14,
-             id:       0x80,
-               },
+        .name = "cio-das16/f", /*  das16.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_none,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x10,
+        .i8254_offset = 0x0c,
+        .size = 0x14,
+        .id = 0x80,
+        },
        {
-             name:     "cio-das16/jr", // cio-das16jr.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:7692,
-             ai_pg:    das16_pg_16jr,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x10,
-             id:       0x00,
-               },
+        .name = "cio-das16/jr",        /*  cio-das16jr.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 7692,
+        .ai_pg = das16_pg_16jr,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x10,
+        .id = 0x00,
+        },
        {
-             name:     "pc104-das16jr",        // pc104-das16jr_xx.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:3300,
-             ai_pg:    das16_pg_16jr,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x10,
-             id:       0x00,
-               },
+        .name = "pc104-das16jr",       /*  pc104-das16jr_xx.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 3300,
+        .ai_pg = das16_pg_16jr,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x10,
+        .id = 0x00,
+        },
        {
-             name:     "cio-das16jr/16",       // cio-das16jr_16.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:16,
-             ai_speed:10000,
-             ai_pg:    das16_pg_16jr_16,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x10,
-             id:       0x00,
-               },
+        .name = "cio-das16jr/16",      /*  cio-das16jr_16.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 16,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_16jr_16,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x10,
+        .id = 0x00,
+        },
        {
-             name:     "pc104-das16jr/16",     // pc104-das16jr_xx.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:16,
-             ai_speed:10000,
-             ai_pg:    das16_pg_16jr_16,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x10,
-             id:       0x00,
-               },
+        .name = "pc104-das16jr/16",    /*  pc104-das16jr_xx.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 16,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_16jr_16,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x10,
+        .id = 0x00,
+        },
        {
-             name:     "das-1201",     // 4924.pdf (keithley user's manual)
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:20000,
-             ai_pg:    das16_pg_none,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-             id:       0x20,
-               },
+        .name = "das-1201",    /*  4924.pdf (keithley user's manual) */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 20000,
+        .ai_pg = das16_pg_none,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0x20,
+        },
        {
-             name:     "das-1202",     // 4924.pdf (keithley user's manual)
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_none,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-             id:       0x20,
-               },
+        .name = "das-1202",    /*  4924.pdf (keithley user's manual) */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_none,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0x20,
+        },
        {
-             name:     "das-1401",     // 4919.pdf and 4922.pdf (keithley user's manual)
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1601,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x0,
-             i8254_offset:0x0c,
-             size:     0x408,
-             id:       0xc0    // 4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0
-               },
+        .name = "das-1401",    /*  4919.pdf and 4922.pdf (keithley user's manual) */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1601,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x0,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0             /*  4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0 */
+        },
        {
-             name:     "das-1402",     // 4919.pdf and 4922.pdf (keithley user's manual)
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1602,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x0,
-             i8254_offset:0x0c,
-             size:     0x408,
-             id:       0xc0    // 4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0
-               },
+        .name = "das-1402",    /*  4919.pdf and 4922.pdf (keithley user's manual) */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1602,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x0,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0             /*  4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0 */
+        },
        {
-             name:     "das-1601",     // 4919.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1601,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "das-1601",    /*  4919.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1601,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "das-1602",     // 4919.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1602,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "das-1602",    /*  4919.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1602,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das1401/12",       // cio-das1400_series.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:6250,
-             ai_pg:    das16_pg_1601,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "cio-das1401/12",      /*  cio-das1400_series.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 6250,
+        .ai_pg = das16_pg_1601,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das1402/12",       // cio-das1400_series.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:6250,
-             ai_pg:    das16_pg_1602,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "cio-das1402/12",      /*  cio-das1400_series.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 6250,
+        .ai_pg = das16_pg_1602,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das1402/16",       // cio-das1400_series.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:16,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1602,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "cio-das1402/16",      /*  cio-das1400_series.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 16,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1602,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das1601/12",       // cio-das160x-1x.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:6250,
-             ai_pg:    das16_pg_1601,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "cio-das1601/12",      /*  cio-das160x-1x.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 6250,
+        .ai_pg = das16_pg_1601,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das1602/12",       // cio-das160x-1x.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1602,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "cio-das1602/12",      /*  cio-das160x-1x.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1602,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das1602/16",       // cio-das160x-1x.pdf
-             ai:       das16_ai_rinsn,
-             ai_nbits:16,
-             ai_speed:10000,
-             ai_pg:    das16_pg_1602,
-             ao:       das16_ao_winsn,
-             ao_nbits:12,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0x400,
-             i8254_offset:0x0c,
-             size:     0x408,
-      id:      0xc0},
+        .name = "cio-das1602/16",      /*  cio-das160x-1x.pdf */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 16,
+        .ai_speed = 10000,
+        .ai_pg = das16_pg_1602,
+        .ao = das16_ao_winsn,
+        .ao_nbits = 12,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0x400,
+        .i8254_offset = 0x0c,
+        .size = 0x408,
+        .id = 0xc0},
        {
-             name:     "cio-das16/330",        // ?
-             ai:       das16_ai_rinsn,
-             ai_nbits:12,
-             ai_speed:3030,
-             ai_pg:    das16_pg_16jr,
-             ao:       NULL,
-             di:       das16_di_rbits,
-             do_:      das16_do_wbits,
-             i8255_offset:0,
-             i8254_offset:0x0c,
-             size:     0x14,
-      id:      0xf0},
+        .name = "cio-das16/330",       /*  ? */
+        .ai = das16_ai_rinsn,
+        .ai_nbits = 12,
+        .ai_speed = 3030,
+        .ai_pg = das16_pg_16jr,
+        .ao = NULL,
+        .di = das16_di_rbits,
+        .do_ = das16_do_wbits,
+        .i8255_offset = 0,
+        .i8254_offset = 0x0c,
+        .size = 0x14,
+        .id = 0xf0},
 #if 0
        {
-             name:     "das16/330i",   // ?
-               },
+        .name = "das16/330i",  /*  ? */
+        },
        {
-             name:     "das16/jr/ctr5",        // ?
-               },
+        .name = "das16/jr/ctr5",       /*  ? */
+        },
        {
-             name:     "cio-das16/m1/16",      // cio-das16_m1_16.pdf, this board is a bit quirky, no dma
-               },
+        .name = "cio-das16/m1/16",     /*  cio-das16_m1_16.pdf, this board is a bit quirky, no dma */
+        },
 #endif
 };
 
-#define n_das16_boards ((sizeof(das16_boards))/(sizeof(das16_board)))
-
-static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it);
-static int das16_detach(struct comedi_device * dev);
+static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it);
+static int das16_detach(struct comedi_device *dev);
 static struct comedi_driver driver_das16 = {
-      driver_name:"das16",
-      module:THIS_MODULE,
-      attach:das16_attach,
-      detach:das16_detach,
-      board_name:&das16_boards[0].name,
-      num_names:n_das16_boards,
-      offset:sizeof(das16_boards[0]),
+       .driver_name = "das16",
+       .module = THIS_MODULE,
+       .attach = das16_attach,
+       .detach = das16_detach,
+       .board_name = &das16_boards[0].name,
+       .num_names = ARRAY_SIZE(das16_boards),
+       .offset = sizeof(das16_boards[0]),
 };
 
 #define DAS16_TIMEOUT 1000
@@ -718,32 +728,33 @@ static inline int timer_period(void)
 {
        return HZ / 20;
 }
+
 struct das16_private_struct {
-       unsigned int ai_unipolar;       // unipolar flag
-       unsigned int ai_singleended;    // single ended flag
-       unsigned int clockbase; // master clock speed in ns
-       volatile unsigned int control_state;    // dma, interrupt and trigger control bits
-       volatile unsigned long adc_byte_count;  // number of bytes remaining
-       unsigned int divisor1;  // divisor dividing master clock to get conversion frequency
-       unsigned int divisor2;  // divisor dividing master clock to get conversion frequency
-       unsigned int dma_chan;  // dma channel
+       unsigned int ai_unipolar;       /*  unipolar flag */
+       unsigned int ai_singleended;    /*  single ended flag */
+       unsigned int clockbase; /*  master clock speed in ns */
+       volatile unsigned int control_state;    /*  dma, interrupt and trigger control bits */
+       volatile unsigned long adc_byte_count;  /*  number of bytes remaining */
+       unsigned int divisor1;  /*  divisor dividing master clock to get conversion frequency */
+       unsigned int divisor2;  /*  divisor dividing master clock to get conversion frequency */
+       unsigned int dma_chan;  /*  dma channel */
        uint16_t *dma_buffer[2];
        dma_addr_t dma_buffer_addr[2];
        unsigned int current_buffer;
-       volatile unsigned int dma_transfer_size;        // target number of bytes to transfer per dma shot
-       // user-defined analog input and output ranges defined from config options
+       volatile unsigned int dma_transfer_size;        /*  target number of bytes to transfer per dma shot */
+       /*  user-defined analog input and output ranges defined from config options */
        struct comedi_lrange *user_ai_range_table;
        struct comedi_lrange *user_ao_range_table;
 
-       struct timer_list timer;        // for timed interrupt
+       struct timer_list timer;        /*  for timed interrupt */
        volatile short timer_running;
-       volatile short timer_mode;      // true if using timer mode
+       volatile short timer_mode;      /*  true if using timer mode */
 };
 #define devpriv ((struct das16_private_struct *)(dev->private))
-#define thisboard ((struct das16_board_struct *)(dev->board_ptr))
+#define thisboard ((struct das16_board *)(dev->board_ptr))
 
-static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_cmd * cmd)
+static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_cmd *cmd)
 {
        int err = 0, tmp;
        int gain, start_chan, i;
@@ -757,7 +768,7 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice *
 
        tmp = cmd->scan_begin_src;
        mask = TRIG_FOLLOW;
-       // if board supports burst mode
+       /*  if board supports burst mode */
        if (thisboard->size > 0x400)
                mask |= TRIG_TIMER | TRIG_EXT;
        cmd->scan_begin_src &= mask;
@@ -766,7 +777,7 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice *
 
        tmp = cmd->convert_src;
        mask = TRIG_TIMER | TRIG_EXT;
-       // if board supports burst mode
+       /*  if board supports burst mode */
        if (thisboard->size > 0x400)
                mask |= TRIG_NOW;
        cmd->convert_src &= mask;
@@ -788,16 +799,16 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice *
 
        /* step 2: make sure trigger sources are unique and mutually compatible */
        if (cmd->scan_begin_src != TRIG_TIMER &&
-               cmd->scan_begin_src != TRIG_EXT &&
-               cmd->scan_begin_src != TRIG_FOLLOW)
+           cmd->scan_begin_src != TRIG_EXT &&
+           cmd->scan_begin_src != TRIG_FOLLOW)
                err++;
        if (cmd->convert_src != TRIG_TIMER &&
-               cmd->convert_src != TRIG_EXT && cmd->convert_src != TRIG_NOW)
+           cmd->convert_src != TRIG_EXT && cmd->convert_src != TRIG_NOW)
                err++;
        if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
                err++;
 
-       // make sure scan_begin_src and convert_src dont conflict
+       /*  make sure scan_begin_src and convert_src dont conflict */
        if (cmd->scan_begin_src == TRIG_FOLLOW && cmd->convert_src == TRIG_NOW)
                err++;
        if (cmd->scan_begin_src != TRIG_FOLLOW && cmd->convert_src != TRIG_NOW)
@@ -824,12 +835,12 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice *
                cmd->scan_end_arg = cmd->chanlist_len;
                err++;
        }
-       // check against maximum frequency
+       /*  check against maximum frequency */
        if (cmd->scan_begin_src == TRIG_TIMER) {
                if (cmd->scan_begin_arg <
-                       thisboard->ai_speed * cmd->chanlist_len) {
+                   thisboard->ai_speed * cmd->chanlist_len) {
                        cmd->scan_begin_arg =
-                               thisboard->ai_speed * cmd->chanlist_len;
+                           thisboard->ai_speed * cmd->chanlist_len;
                        err++;
                }
        }
@@ -849,40 +860,44 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice *
        if (err)
                return 3;
 
-       // step 4: fix up arguments
+       /*  step 4: fix up arguments */
        if (cmd->scan_begin_src == TRIG_TIMER) {
                unsigned int tmp = cmd->scan_begin_arg;
-               // set divisors, correct timing arguments
+               /*  set divisors, correct timing arguments */
                i8253_cascade_ns_to_timer_2div(devpriv->clockbase,
-                       &(devpriv->divisor1), &(devpriv->divisor2),
-                       &(cmd->scan_begin_arg), cmd->flags & TRIG_ROUND_MASK);
+                                              &(devpriv->divisor1),
+                                              &(devpriv->divisor2),
+                                              &(cmd->scan_begin_arg),
+                                              cmd->flags & TRIG_ROUND_MASK);
                err += (tmp != cmd->scan_begin_arg);
        }
        if (cmd->convert_src == TRIG_TIMER) {
                unsigned int tmp = cmd->convert_arg;
-               // set divisors, correct timing arguments
+               /*  set divisors, correct timing arguments */
                i8253_cascade_ns_to_timer_2div(devpriv->clockbase,
-                       &(devpriv->divisor1), &(devpriv->divisor2),
-                       &(cmd->convert_arg), cmd->flags & TRIG_ROUND_MASK);
+                                              &(devpriv->divisor1),
+                                              &(devpriv->divisor2),
+                                              &(cmd->convert_arg),
+                                              cmd->flags & TRIG_ROUND_MASK);
                err += (tmp != cmd->convert_arg);
        }
        if (err)
                return 4;
 
-       // check channel/gain list against card's limitations
+       /*  check channel/gain list against card's limitations */
        if (cmd->chanlist) {
                gain = CR_RANGE(cmd->chanlist[0]);
                start_chan = CR_CHAN(cmd->chanlist[0]);
                for (i = 1; i < cmd->chanlist_len; i++) {
                        if (CR_CHAN(cmd->chanlist[i]) !=
-                               (start_chan + i) % s->n_chan) {
+                           (start_chan + i) % s->n_chan) {
                                comedi_error(dev,
-                                       "entries in chanlist must be consecutive channels, counting upwards\n");
+                                            "entries in chanlist must be consecutive channels, counting upwards\n");
                                err++;
                        }
                        if (CR_RANGE(cmd->chanlist[i]) != gain) {
                                comedi_error(dev,
-                                       "entries in chanlist must all have the same gain\n");
+                                            "entries in chanlist must all have the same gain\n");
                                err++;
                        }
                }
@@ -893,7 +908,7 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice *
        return 0;
 }
 
-static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s)
+static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        struct comedi_async *async = s->async;
        struct comedi_cmd *cmd = &async->cmd;
@@ -902,25 +917,25 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice *
        int range;
 
        if (devpriv->dma_chan == 0 || (dev->irq == 0
-                       && devpriv->timer_mode == 0)) {
+                                      && devpriv->timer_mode == 0)) {
                comedi_error(dev,
-                       "irq (or use of 'timer mode') dma required to execute comedi_cmd");
+                            "irq (or use of 'timer mode') dma required to execute comedi_cmd");
                return -1;
        }
        if (cmd->flags & TRIG_RT) {
                comedi_error(dev,
-                       "isa dma transfers cannot be performed with TRIG_RT, aborting");
+                            "isa dma transfers cannot be performed with TRIG_RT, aborting");
                return -1;
        }
 
        devpriv->adc_byte_count =
-               cmd->stop_arg * cmd->chanlist_len * sizeof(uint16_t);
+           cmd->stop_arg * cmd->chanlist_len * sizeof(uint16_t);
 
-       // disable conversions for das1600 mode
+       /*  disable conversions for das1600 mode */
        if (thisboard->size > 0x400) {
                outb(DAS1600_CONV_DISABLE, dev->iobase + DAS1600_CONV);
        }
-       // set scan limits
+       /*  set scan limits */
        byte = CR_CHAN(cmd->chanlist[0]);
        byte |= CR_CHAN(cmd->chanlist[cmd->chanlist_len - 1]) << 4;
        outb(byte, dev->iobase + DAS16_MUX);
@@ -930,13 +945,13 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice *
        if (thisboard->ai_pg != das16_pg_none) {
                range = CR_RANGE(cmd->chanlist[0]);
                outb((das16_gainlists[thisboard->ai_pg])[range],
-                       dev->iobase + DAS16_GAIN);
+                    dev->iobase + DAS16_GAIN);
        }
 
        /* set counter mode and counts */
        cmd->convert_arg =
-               das16_set_pacer(dev, cmd->convert_arg,
-               cmd->flags & TRIG_ROUND_MASK);
+           das16_set_pacer(dev, cmd->convert_arg,
+                           cmd->flags & TRIG_ROUND_MASK);
        DEBUG_PRINT("pacer period: %d ns\n", cmd->convert_arg);
 
        /* enable counters */
@@ -945,7 +960,7 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice *
        if (thisboard->size > 0x400) {
                if (cmd->convert_src == TRIG_NOW) {
                        outb(DAS1600_BURST_VAL, dev->iobase + DAS1600_BURST);
-                       // set burst length
+                       /*  set burst length */
                        byte |= BURST_LEN_BITS(cmd->chanlist_len - 1);
                } else {
                        outb(0, dev->iobase + DAS1600_BURST);
@@ -953,7 +968,7 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice *
        }
        outb(byte, dev->iobase + DAS16_PACER);
 
-       // set up dma transfer
+       /*  set up dma transfer */
        flags = claim_dma_lock();
        disable_dma(devpriv->dma_chan);
        /* clear flip-flop to make sure 2-byte registers for
@@ -961,14 +976,14 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice *
        clear_dma_ff(devpriv->dma_chan);
        devpriv->current_buffer = 0;
        set_dma_addr(devpriv->dma_chan,
-               devpriv->dma_buffer_addr[devpriv->current_buffer]);
-       // set appropriate size of transfer
+                    devpriv->dma_buffer_addr[devpriv->current_buffer]);
+       /*  set appropriate size of transfer */
        devpriv->dma_transfer_size = das16_suggest_transfer_size(dev, *cmd);
        set_dma_count(devpriv->dma_chan, devpriv->dma_transfer_size);
        enable_dma(devpriv->dma_chan);
        release_dma_lock(flags);
 
-       // set up interrupt
+       /*  set up interrupt */
        if (devpriv->timer_mode) {
                devpriv->timer_running = 1;
                devpriv->timer.expires = jiffies + timer_period();
@@ -996,18 +1011,18 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice *
        return 0;
 }
 
-static int das16_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
+static int das16_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        unsigned long flags;
 
-       comedi_spin_lock_irqsave(&dev->spinlock, flags);
+       spin_lock_irqsave(&dev->spinlock, flags);
        /* disable interrupts, dma and pacer clocked conversions */
        devpriv->control_state &= ~DAS16_INTE & ~PACING_MASK & ~DMA_ENABLE;
        outb(devpriv->control_state, dev->iobase + DAS16_CONTROL);
        if (devpriv->dma_chan)
                disable_dma(devpriv->dma_chan);
 
-       // disable SW timer
+       /*  disable SW timer */
        if (devpriv->timer_mode && devpriv->timer_running) {
                devpriv->timer_running = 0;
                del_timer(&devpriv->timer);
@@ -1018,12 +1033,12 @@ static int das16_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
                outb(0, dev->iobase + DAS1600_BURST);
        }
 
-       comedi_spin_unlock_irqrestore(&dev->spinlock, flags);
+       spin_unlock_irqrestore(&dev->spinlock, flags);
 
        return 0;
 }
 
-static void das16_reset(struct comedi_device * dev)
+static void das16_reset(struct comedi_device *dev)
 {
        outb(0, dev->iobase + DAS16_STATUS);
        outb(0, dev->iobase + DAS16_CONTROL);
@@ -1031,15 +1046,15 @@ static void das16_reset(struct comedi_device * dev)
        outb(0, dev->iobase + DAS16_CNTR_CONTROL);
 }
 
-static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int das16_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data)
 {
        int i, n;
        int range;
        int chan;
        int msb, lsb;
 
-       // disable interrupts and pacing
+       /*  disable interrupts and pacing */
        devpriv->control_state &= ~DAS16_INTE & ~DMA_ENABLE & ~PACING_MASK;
        outb(devpriv->control_state, dev->iobase + DAS16_CONTROL);
 
@@ -1052,7 +1067,7 @@ static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice *
        if (thisboard->ai_pg != das16_pg_none) {
                range = CR_RANGE(insn->chanspec);
                outb((das16_gainlists[thisboard->ai_pg])[range],
-                       dev->iobase + DAS16_GAIN);
+                    dev->iobase + DAS16_GAIN);
        }
 
        for (n = 0; n < insn->n; n++) {
@@ -1064,7 +1079,7 @@ static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice *
                                break;
                }
                if (i == DAS16_TIMEOUT) {
-                       rt_printk("das16: timeout\n");
+                       printk("das16: timeout\n");
                        return -ETIME;
                }
                msb = inb(dev->iobase + DAS16_AI_MSB);
@@ -1079,8 +1094,8 @@ static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice *
        return n;
 }
 
-static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int das16_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data)
 {
        unsigned int bits;
 
@@ -1091,17 +1106,17 @@ static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice *
        return 2;
 }
 
-static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int das16_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data)
 {
        unsigned int wbits;
 
-       // only set bits that have been masked
+       /*  only set bits that have been masked */
        data[0] &= 0xf;
        wbits = s->state;
-       // zero bits that have been masked
+       /*  zero bits that have been masked */
        wbits &= ~data[0];
-       // set masked bits
+       /*  set masked bits */
        wbits |= data[0] & data[1];
        s->state = wbits;
        data[1] = wbits;
@@ -1111,8 +1126,8 @@ static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice *
        return 2;
 }
 
-static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int das16_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data)
 {
        int i;
        int lsb, msb;
@@ -1135,7 +1150,7 @@ static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice *
        return i;
 }
 
-static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG)
+static irqreturn_t das16_dma_interrupt(int irq, void *d)
 {
        int status;
        struct comedi_device *dev = d;
@@ -1155,7 +1170,7 @@ static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG)
 
 static void das16_timer_interrupt(unsigned long arg)
 {
-       struct comedi_device *dev = (struct comedi_device *) arg;
+       struct comedi_device *dev = (struct comedi_device *)arg;
 
        das16_interrupt(dev);
 
@@ -1169,7 +1184,7 @@ static void das16_timer_interrupt(unsigned long arg)
        an even transfer count after disabling dma
        channel.
 */
-static int disable_dma_on_even(struct comedi_device * dev)
+static int disable_dma_on_even(struct comedi_device *dev)
 {
        int residue;
        int i;
@@ -1182,7 +1197,7 @@ static int disable_dma_on_even(struct comedi_device * dev)
                enable_dma(devpriv->dma_chan);
                for (j = 0; j < enable_timeout; ++j) {
                        int new_residue;
-                       comedi_udelay(2);
+                       udelay(2);
                        new_residue = get_dma_residue(devpriv->dma_chan);
                        if (new_residue != residue)
                                break;
@@ -1192,12 +1207,12 @@ static int disable_dma_on_even(struct comedi_device * dev)
        }
        if (i == disable_limit) {
                comedi_error(dev,
-                       "failed to get an even dma transfer, could be trouble.");
+                            "failed to get an even dma transfer, could be trouble.");
        }
        return residue;
 }
 
-static void das16_interrupt(struct comedi_device * dev)
+static void das16_interrupt(struct comedi_device *dev)
 {
        unsigned long dma_flags, spin_flags;
        struct comedi_subdevice *s = dev->read_subdev;
@@ -1210,7 +1225,7 @@ static void das16_interrupt(struct comedi_device * dev)
                comedi_error(dev, "premature interrupt");
                return;
        }
-       // initialize async here to make sure it is not NULL
+       /*  initialize async here to make sure it is not NULL */
        async = s->async;
        cmd = &async->cmd;
 
@@ -1219,9 +1234,9 @@ static void das16_interrupt(struct comedi_device * dev)
                return;
        }
 
-       comedi_spin_lock_irqsave(&dev->spinlock, spin_flags);
+       spin_lock_irqsave(&dev->spinlock, spin_flags);
        if ((devpriv->control_state & DMA_ENABLE) == 0) {
-               comedi_spin_unlock_irqrestore(&dev->spinlock, spin_flags);
+               spin_unlock_irqrestore(&dev->spinlock, spin_flags);
                DEBUG_PRINT("interrupt while dma disabled?\n");
                return;
        }
@@ -1230,7 +1245,7 @@ static void das16_interrupt(struct comedi_device * dev)
        clear_dma_ff(devpriv->dma_chan);
        residue = disable_dma_on_even(dev);
 
-       // figure out how many points to read
+       /*  figure out how many points to read */
        if (residue > devpriv->dma_transfer_size) {
                comedi_error(dev, "residue > transfer size!\n");
                async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
@@ -1247,15 +1262,15 @@ static void das16_interrupt(struct comedi_device * dev)
        devpriv->current_buffer = (devpriv->current_buffer + 1) % 2;
        devpriv->adc_byte_count -= num_bytes;
 
-       // figure out how many bytes for next transfer
+       /*  figure out how many bytes for next transfer */
        if (cmd->stop_src == TRIG_COUNT && devpriv->timer_mode == 0 &&
-               devpriv->dma_transfer_size > devpriv->adc_byte_count)
+           devpriv->dma_transfer_size > devpriv->adc_byte_count)
                devpriv->dma_transfer_size = devpriv->adc_byte_count;
 
-       // re-enable  dma
+       /*  re-enable  dma */
        if ((async->events & COMEDI_CB_EOA) == 0) {
                set_dma_addr(devpriv->dma_chan,
-                       devpriv->dma_buffer_addr[devpriv->current_buffer]);
+                            devpriv->dma_buffer_addr[devpriv->current_buffer]);
                set_dma_count(devpriv->dma_chan, devpriv->dma_transfer_size);
                enable_dma(devpriv->dma_chan);
                /* reenable conversions for das1600 mode, (stupid hardware) */
@@ -1265,19 +1280,20 @@ static void das16_interrupt(struct comedi_device * dev)
        }
        release_dma_lock(dma_flags);
 
-       comedi_spin_unlock_irqrestore(&dev->spinlock, spin_flags);
+       spin_unlock_irqrestore(&dev->spinlock, spin_flags);
 
        cfc_write_array_to_buffer(s,
-               devpriv->dma_buffer[buffer_index], num_bytes);
+                                 devpriv->dma_buffer[buffer_index], num_bytes);
 
        cfc_handle_events(dev, s);
 }
 
-static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns,
-       int rounding_flags)
+static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns,
+                                   int rounding_flags)
 {
        i8253_cascade_ns_to_timer_2div(devpriv->clockbase, &(devpriv->divisor1),
-               &(devpriv->divisor2), &ns, rounding_flags & TRIG_ROUND_MASK);
+                                      &(devpriv->divisor2), &ns,
+                                      rounding_flags & TRIG_ROUND_MASK);
 
        /* Write the values of ctr1 and ctr2 into counters 1 and 2 */
        i8254_load(dev->iobase + DAS16_CNTR0_DATA, 0, 1, devpriv->divisor1, 2);
@@ -1286,7 +1302,7 @@ static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns,
        return ns;
 }
 
-static void reg_dump(struct comedi_device * dev)
+static void reg_dump(struct comedi_device *dev)
 {
        DEBUG_PRINT("********DAS1600 REGISTER DUMP********\n");
        DEBUG_PRINT("DAS16_MUX: %x\n", inb(dev->iobase + DAS16_MUX));
@@ -1296,15 +1312,15 @@ static void reg_dump(struct comedi_device * dev)
        DEBUG_PRINT("DAS16_PACER: %x\n", inb(dev->iobase + DAS16_PACER));
        DEBUG_PRINT("DAS16_GAIN: %x\n", inb(dev->iobase + DAS16_GAIN));
        DEBUG_PRINT("DAS16_CNTR_CONTROL: %x\n",
-               inb(dev->iobase + DAS16_CNTR_CONTROL));
+                   inb(dev->iobase + DAS16_CNTR_CONTROL));
        DEBUG_PRINT("DAS1600_CONV: %x\n", inb(dev->iobase + DAS1600_CONV));
        DEBUG_PRINT("DAS1600_BURST: %x\n", inb(dev->iobase + DAS1600_BURST));
        DEBUG_PRINT("DAS1600_ENABLE: %x\n", inb(dev->iobase + DAS1600_ENABLE));
        DEBUG_PRINT("DAS1600_STATUS_B: %x\n",
-               inb(dev->iobase + DAS1600_STATUS_B));
+                   inb(dev->iobase + DAS1600_STATUS_B));
 }
 
-static int das16_probe(struct comedi_device * dev, struct comedi_devconfig * it)
+static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        int status;
        int diobits;
@@ -1332,13 +1348,13 @@ static int das16_probe(struct comedi_device * dev, struct comedi_devconfig * it)
        printk(" id bits are 0x%02x\n", diobits);
        if (thisboard->id != diobits) {
                printk(" requested board's id bits are 0x%x (ignore)\n",
-                       thisboard->id);
+                      thisboard->id);
        }
 
        return 0;
 }
 
-static int das1600_mode_detect(struct comedi_device * dev)
+static int das1600_mode_detect(struct comedi_device *dev)
 {
        int status = 0;
 
@@ -1366,7 +1382,7 @@ static int das1600_mode_detect(struct comedi_device * dev)
  *   3  Clock speed (in MHz)
  */
 
-static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it)
+static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
        int ret;
@@ -1391,16 +1407,18 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
 
        printk("comedi%d: das16:", dev->minor);
 
-       // check that clock setting is valid
+       /*  check that clock setting is valid */
        if (it->options[3]) {
                if (it->options[3] != 0 &&
-                       it->options[3] != 1 && it->options[3] != 10) {
-                       printk("\n Invalid option.  Master clock must be set to 1 or 10 (MHz)\n");
+                   it->options[3] != 1 && it->options[3] != 10) {
+                       printk
+                           ("\n Invalid option.  Master clock must be set to 1 or 10 (MHz)\n");
                        return -EINVAL;
                }
        }
 
-       if ((ret = alloc_private(dev, sizeof(struct das16_private_struct))) < 0)
+       ret = alloc_private(dev, sizeof(struct das16_private_struct));
+       if (ret < 0)
                return ret;
 
        if (thisboard->size < 0x400) {
@@ -1411,47 +1429,48 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
                }
        } else {
                printk(" 0x%04lx-0x%04lx 0x%04lx-0x%04lx\n",
-                       iobase, iobase + 0x0f,
-                       iobase + 0x400,
-                       iobase + 0x400 + (thisboard->size & 0x3ff));
+                      iobase, iobase + 0x0f,
+                      iobase + 0x400,
+                      iobase + 0x400 + (thisboard->size & 0x3ff));
                if (!request_region(iobase, 0x10, "das16")) {
                        printk(" I/O port conflict:  0x%04lx-0x%04lx\n",
-                               iobase, iobase + 0x0f);
+                              iobase, iobase + 0x0f);
                        return -EIO;
                }
                if (!request_region(iobase + 0x400, thisboard->size & 0x3ff,
-                               "das16")) {
+                                   "das16")) {
                        release_region(iobase, 0x10);
                        printk(" I/O port conflict:  0x%04lx-0x%04lx\n",
-                               iobase + 0x400,
-                               iobase + 0x400 + (thisboard->size & 0x3ff));
+                              iobase + 0x400,
+                              iobase + 0x400 + (thisboard->size & 0x3ff));
                        return -EIO;
                }
        }
 
        dev->iobase = iobase;
 
-       // probe id bits to make sure they are consistent
+       /*  probe id bits to make sure they are consistent */
        if (das16_probe(dev, it)) {
                printk(" id bits do not match selected board, aborting\n");
                return -EINVAL;
        }
        dev->board_name = thisboard->name;
 
-       // get master clock speed
+       /*  get master clock speed */
        if (thisboard->size < 0x400) {
                if (it->options[3])
                        devpriv->clockbase = 1000 / it->options[3];
                else
-                       devpriv->clockbase = 1000;      // 1 MHz default
+                       devpriv->clockbase = 1000;      /*  1 MHz default */
        } else {
                das1600_mode_detect(dev);
        }
 
        /* now for the irq */
        if (irq > 1 && irq < 8) {
-               if ((ret = comedi_request_irq(irq, das16_dma_interrupt, 0,
-                                       "das16", dev)) < 0)
+               ret = request_irq(irq, das16_dma_interrupt, 0, "das16", dev);
+
+               if (ret < 0)
                        return ret;
                dev->irq = irq;
                printk(" ( irq = %u )", irq);
@@ -1462,20 +1481,23 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
                return -EINVAL;
        }
 
-       // initialize dma
+       /*  initialize dma */
        dma_chan = it->options[2];
        if (dma_chan == 1 || dma_chan == 3) {
-               // allocate dma buffers
+               /*  allocate dma buffers */
                int i;
                for (i = 0; i < 2; i++) {
                        devpriv->dma_buffer[i] = pci_alloc_consistent(NULL,
-                               DAS16_DMA_SIZE, &devpriv->dma_buffer_addr[i]);
+                                                                     DAS16_DMA_SIZE,
+                                                                     &devpriv->
+                                                                     dma_buffer_addr
+                                                                     [i]);
                        if (devpriv->dma_buffer[i] == NULL)
                                return -ENOMEM;
                }
                if (request_dma(dma_chan, "das16")) {
                        printk(" failed to allocate dma channel %i\n",
-                               dma_chan);
+                              dma_chan);
                        return -EINVAL;
                }
                devpriv->dma_chan = dma_chan;
@@ -1491,27 +1513,27 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
                return -EINVAL;
        }
 
-       // get any user-defined input range
+       /*  get any user-defined input range */
        if (thisboard->ai_pg == das16_pg_none &&
-               (it->options[4] || it->options[5])) {
-               // allocate single-range range table
+           (it->options[4] || it->options[5])) {
+               /*  allocate single-range range table */
                devpriv->user_ai_range_table =
-                       kmalloc(sizeof(struct comedi_lrange) + sizeof(struct comedi_krange),
-                       GFP_KERNEL);
-               // initialize ai range
+                   kmalloc(sizeof(struct comedi_lrange) +
+                           sizeof(struct comedi_krange), GFP_KERNEL);
+               /*  initialize ai range */
                devpriv->user_ai_range_table->length = 1;
                user_ai_range = devpriv->user_ai_range_table->range;
                user_ai_range->min = it->options[4];
                user_ai_range->max = it->options[5];
                user_ai_range->flags = UNIT_volt;
        }
-       // get any user-defined output range
+       /*  get any user-defined output range */
        if (it->options[6] || it->options[7]) {
-               // allocate single-range range table
+               /*  allocate single-range range table */
                devpriv->user_ao_range_table =
-                       kmalloc(sizeof(struct comedi_lrange) + sizeof(struct comedi_krange),
-                       GFP_KERNEL);
-               // initialize ao range
+                   kmalloc(sizeof(struct comedi_lrange) +
+                           sizeof(struct comedi_krange), GFP_KERNEL);
+               /*  initialize ao range */
                devpriv->user_ao_range_table->length = 1;
                user_ao_range = devpriv->user_ao_range_table->range;
                user_ao_range->min = it->options[6];
@@ -1526,7 +1548,8 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
        }
        devpriv->timer_mode = timer_mode ? 1 : 0;
 
-       if ((ret = alloc_subdevices(dev, 5)) < 0)
+       ret = alloc_subdevices(dev, 5);
+       if (ret < 0)
                return ret;
 
        s = dev->subdevices + 0;
@@ -1545,7 +1568,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
                        s->subdev_flags |= SDF_DIFF;
                }
                s->maxdata = (1 << thisboard->ai_nbits) - 1;
-               if (devpriv->user_ai_range_table) {     // user defined ai range
+               if (devpriv->user_ai_range_table) {     /*  user defined ai range */
                        s->range_table = devpriv->user_ai_range_table;
                } else if (devpriv->ai_unipolar) {
                        s->range_table = das16_ai_uni_lranges[thisboard->ai_pg];
@@ -1568,7 +1591,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
                s->subdev_flags = SDF_WRITABLE;
                s->n_chan = 2;
                s->maxdata = (1 << thisboard->ao_nbits) - 1;
-               if (devpriv->user_ao_range_table) {     // user defined ao range
+               if (devpriv->user_ao_range_table) {     /*  user defined ao range */
                        s->range_table = devpriv->user_ao_range_table;
                } else {
                        s->range_table = &range_unknown;
@@ -1600,7 +1623,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
                s->maxdata = 1;
                s->range_table = &range_digital;
                s->insn_bits = thisboard->do_;
-               // initialize digital output lines
+               /*  initialize digital output lines */
                outb(s->state, dev->iobase + DAS16_DIO);
        } else {
                s->type = COMEDI_SUBD_UNUSED;
@@ -1610,7 +1633,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
        /* 8255 */
        if (thisboard->i8255_offset != 0) {
                subdev_8255_init(dev, s, NULL, (dev->iobase +
-                               thisboard->i8255_offset));
+                                               thisboard->i8255_offset));
        } else {
                s->type = COMEDI_SUBD_UNUSED;
        }
@@ -1620,7 +1643,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
        devpriv->control_state = DAS16_IRQ(dev->irq);
        outb(devpriv->control_state, dev->iobase + DAS16_CONTROL);
 
-       // turn on das1600 mode if available
+       /*  turn on das1600 mode if available */
        if (thisboard->size > 0x400) {
                outb(DAS1600_ENABLE_VAL, dev->iobase + DAS1600_ENABLE);
                outb(0, dev->iobase + DAS1600_CONV);
@@ -1630,7 +1653,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it
        return 0;
 }
 
-static int das16_detach(struct comedi_device * dev)
+static int das16_detach(struct comedi_device *dev)
 {
        printk("comedi%d: das16: remove\n", dev->minor);
 
@@ -1644,8 +1667,9 @@ static int das16_detach(struct comedi_device * dev)
                for (i = 0; i < 2; i++) {
                        if (devpriv->dma_buffer[i])
                                pci_free_consistent(NULL, DAS16_DMA_SIZE,
-                                       devpriv->dma_buffer[i],
-                                       devpriv->dma_buffer_addr[i]);
+                                                   devpriv->dma_buffer[i],
+                                                   devpriv->
+                                                   dma_buffer_addr[i]);
                }
                if (devpriv->dma_chan)
                        free_dma(devpriv->dma_chan);
@@ -1656,7 +1680,7 @@ static int das16_detach(struct comedi_device * dev)
        }
 
        if (dev->irq)
-               comedi_free_irq(dev->irq, dev);
+               free_irq(dev->irq, dev);
 
        if (dev->iobase) {
                if (thisboard->size < 0x400) {
@@ -1664,7 +1688,7 @@ static int das16_detach(struct comedi_device * dev)
                } else {
                        release_region(dev->iobase, 0x10);
                        release_region(dev->iobase + 0x400,
-                               thisboard->size & 0x3ff);
+                                      thisboard->size & 0x3ff);
                }
        }
 
@@ -1673,9 +1697,9 @@ static int das16_detach(struct comedi_device * dev)
 
 COMEDI_INITCLEANUP(driver_das16);
 
-// utility function that suggests a dma transfer size in bytes
-static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
-       struct comedi_cmd cmd)
+/* utility function that suggests a dma transfer size in bytes */
+static unsigned int das16_suggest_transfer_size(struct comedi_device *dev,
+                                               struct comedi_cmd cmd)
 {
        unsigned int size;
        unsigned int freq;
@@ -1692,18 +1716,18 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
                freq = 1000000000 / cmd.convert_arg;
        else if (cmd.scan_begin_src == TRIG_TIMER)
                freq = (1000000000 / cmd.scan_begin_arg) * cmd.chanlist_len;
-       // return some default value
+       /*  return some default value */
        else
                freq = 0xffffffff;
 
        if (cmd.flags & TRIG_WAKE_EOS) {
                size = sample_size * cmd.chanlist_len;
        } else {
-               // make buffer fill in no more than 1/3 second
+               /*  make buffer fill in no more than 1/3 second */
                size = (freq / 3) * sample_size;
        }
 
-       // set a minimum and maximum size allowed
+       /*  set a minimum and maximum size allowed */
        if (size > DAS16_DMA_SIZE)
                size = DAS16_DMA_SIZE - DAS16_DMA_SIZE % sample_size;
        else if (size < sample_size)
@@ -1715,8 +1739,10 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
        return size;
 }
 
-static void das16_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s,
-       void *array, unsigned int num_bytes, unsigned int start_chan_index)
+static void das16_ai_munge(struct comedi_device *dev,
+                          struct comedi_subdevice *s, void *array,
+                          unsigned int num_bytes,
+                          unsigned int start_chan_index)
 {
        unsigned int i, num_samples = num_bytes / sizeof(short);
        short *data = array;