Staging: fix assorted typos all over the place
[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / dt2811.c
index 165ea6f..51ef695 100644 (file)
@@ -45,6 +45,7 @@ Configuration options:
   [4] - D/A 1 range (same choices)
 */
 
+#include <linux/interrupt.h>
 #include "../comedidev.h"
 
 #include <linux/ioport.h>
@@ -52,46 +53,95 @@ Configuration options:
 static const char *driver_name = "dt2811";
 
 static const struct comedi_lrange range_dt2811_pgh_ai_5_unipolar = { 4, {
-                       RANGE(0, 5),
-                       RANGE(0, 2.5),
-                       RANGE(0, 1.25),
-                       RANGE(0, 0.625)
-       }
+                                                                        RANGE
+                                                                        (0, 5),
+                                                                        RANGE
+                                                                        (0,
+                                                                         2.5),
+                                                                        RANGE
+                                                                        (0,
+                                                                         1.25),
+                                                                        RANGE
+                                                                        (0,
+                                                                         0.625)
+                                                                        }
 };
+
 static const struct comedi_lrange range_dt2811_pgh_ai_2_5_bipolar = { 4, {
-                       RANGE(-2.5, 2.5),
-                       RANGE(-1.25, 1.25),
-                       RANGE(-0.625, 0.625),
-                       RANGE(-0.3125, 0.3125)
-       }
+                                                                         RANGE
+                                                                         (-2.5,
+                                                                          2.5),
+                                                                         RANGE
+                                                                         (-1.25,
+                                                                          1.25),
+                                                                         RANGE
+                                                                         (-0.625,
+                                                                          0.625),
+                                                                         RANGE
+                                                                         (-0.3125,
+                                                                          0.3125)
+                                                                         }
 };
+
 static const struct comedi_lrange range_dt2811_pgh_ai_5_bipolar = { 4, {
-                       RANGE(-5, 5),
-                       RANGE(-2.5, 2.5),
-                       RANGE(-1.25, 1.25),
-                       RANGE(-0.625, 0.625)
-       }
+                                                                       RANGE
+                                                                       (-5, 5),
+                                                                       RANGE
+                                                                       (-2.5,
+                                                                        2.5),
+                                                                       RANGE
+                                                                       (-1.25,
+                                                                        1.25),
+                                                                       RANGE
+                                                                       (-0.625,
+                                                                        0.625)
+                                                                       }
 };
+
 static const struct comedi_lrange range_dt2811_pgl_ai_5_unipolar = { 4, {
-                       RANGE(0, 5),
-                       RANGE(0, 0.5),
-                       RANGE(0, 0.05),
-                       RANGE(0, 0.01)
-       }
+                                                                        RANGE
+                                                                        (0, 5),
+                                                                        RANGE
+                                                                        (0,
+                                                                         0.5),
+                                                                        RANGE
+                                                                        (0,
+                                                                         0.05),
+                                                                        RANGE
+                                                                        (0,
+                                                                         0.01)
+                                                                        }
 };
+
 static const struct comedi_lrange range_dt2811_pgl_ai_2_5_bipolar = { 4, {
-                       RANGE(-2.5, 2.5),
-                       RANGE(-0.25, 0.25),
-                       RANGE(-0.025, 0.025),
-                       RANGE(-0.005, 0.005)
-       }
+                                                                         RANGE
+                                                                         (-2.5,
+                                                                          2.5),
+                                                                         RANGE
+                                                                         (-0.25,
+                                                                          0.25),
+                                                                         RANGE
+                                                                         (-0.025,
+                                                                          0.025),
+                                                                         RANGE
+                                                                         (-0.005,
+                                                                          0.005)
+                                                                         }
 };
+
 static const struct comedi_lrange range_dt2811_pgl_ai_5_bipolar = { 4, {
-                       RANGE(-5, 5),
-                       RANGE(-0.5, 0.5),
-                       RANGE(-0.05, 0.05),
-                       RANGE(-0.01, 0.01)
-       }
+                                                                       RANGE
+                                                                       (-5, 5),
+                                                                       RANGE
+                                                                       (-0.5,
+                                                                        0.5),
+                                                                       RANGE
+                                                                       (-0.05,
+                                                                        0.05),
+                                                                       RANGE
+                                                                       (-0.01,
+                                                                        0.01)
+                                                                       }
 };
 
 /*
@@ -191,54 +241,61 @@ static const struct comedi_lrange range_dt2811_pgl_ai_5_bipolar = { 4, {
 #define DT2811_INTENB   0x04
 #define DT2811_ADMODE   0x03
 
-typedef struct {
+struct dt2811_board {
+
        const char *name;
        const struct comedi_lrange *bip_5;
        const struct comedi_lrange *bip_2_5;
        const struct comedi_lrange *unip_5;
-} boardtype;
-static const boardtype boardtypes[] = {
+};
+
+static const struct dt2811_board boardtypes[] = {
        {"dt2811-pgh",
-                       &range_dt2811_pgh_ai_5_bipolar,
-                       &range_dt2811_pgh_ai_2_5_bipolar,
-                       &range_dt2811_pgh_ai_5_unipolar,
-               },
+        &range_dt2811_pgh_ai_5_bipolar,
+        &range_dt2811_pgh_ai_2_5_bipolar,
+        &range_dt2811_pgh_ai_5_unipolar,
+        },
        {"dt2811-pgl",
-                       &range_dt2811_pgl_ai_5_bipolar,
-                       &range_dt2811_pgl_ai_2_5_bipolar,
-                       &range_dt2811_pgl_ai_5_unipolar,
-               },
+        &range_dt2811_pgl_ai_5_bipolar,
+        &range_dt2811_pgl_ai_2_5_bipolar,
+        &range_dt2811_pgl_ai_5_unipolar,
+        },
 };
 
-#define this_board ((const boardtype *)dev->board_ptr)
+#define this_board ((const struct dt2811_board *)dev->board_ptr)
 
-static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it);
-static int dt2811_detach(struct comedi_device * dev);
+static int dt2811_attach(struct comedi_device *dev,
+                        struct comedi_devconfig *it);
+static int dt2811_detach(struct comedi_device *dev);
 static struct comedi_driver driver_dt2811 = {
-      driver_name:"dt2811",
-      module:THIS_MODULE,
-      attach:dt2811_attach,
-      detach:dt2811_detach,
-      board_name:&boardtypes[0].name,
-      num_names:sizeof(boardtypes) / sizeof(boardtype),
-      offset:sizeof(boardtype),
+       .driver_name = "dt2811",
+       .module = THIS_MODULE,
+       .attach = dt2811_attach,
+       .detach = dt2811_detach,
+       .board_name = &boardtypes[0].name,
+       .num_names = ARRAY_SIZE(boardtypes),
+       .offset = sizeof(struct dt2811_board),
 };
 
 COMEDI_INITCLEANUP(driver_dt2811);
 
-static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
-static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data);
+static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data);
+static int dt2811_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data);
+static int dt2811_ao_insn_read(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data);
+static int dt2811_di_insn_bits(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data);
+static int dt2811_do_insn_bits(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data);
 
 enum { card_2811_pgh, card_2811_pgl };
-typedef struct {
+
+struct dt2811_private {
        int ntrig;
        int curadchan;
        enum {
@@ -249,9 +306,9 @@ typedef struct {
        } dac_range[2];
        const struct comedi_lrange *range_type_list[2];
        unsigned int ao_readback[2];
-} dt2811_private;
+};
 
-#define devpriv ((dt2811_private *)dev->private)
+#define devpriv ((struct dt2811_private *)dev->private)
 
 static const struct comedi_lrange *dac_range_types[] = {
        &range_bipolar5,
@@ -262,7 +319,7 @@ static const struct comedi_lrange *dac_range_types[] = {
 #define DT2811_TIMEOUT 5
 
 #if 0
-static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG)
+static irqreturn_t dt2811_interrupt(int irq, void *d)
 {
        int lo, hi;
        int data;
@@ -308,11 +365,12 @@ static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG)
                  2 == unipolar 5V  (0V -- +5V)
 */
 
-static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
+static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-       //int i, irq;
-       //unsigned long irqs;
-       //long flags;
+       /* int i, irq; */
+       /* unsigned long irqs; */
+       /* long flags; */
+
        int ret;
        struct comedi_subdevice *s;
        unsigned long iobase;
@@ -331,7 +389,7 @@ static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
 
 #if 0
        outb(0, dev->iobase + DT2811_ADCSR);
-       comedi_udelay(100);
+       udelay(100);
        i = inb(dev->iobase + DT2811_ADDATLO);
        i = inb(dev->iobase + DT2811_ADDATHI);
 #endif
@@ -344,10 +402,10 @@ static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
                irqs = probe_irq_on();
 
                outb(DT2811_CLRERROR | DT2811_INTENB,
-                       dev->iobase + DT2811_ADCSR);
+                    dev->iobase + DT2811_ADCSR);
                outb(0, dev->iobase + DT2811_ADGCR);
 
-               comedi_udelay(100);
+               udelay(100);
 
                irq = probe_irq_off(irqs);
                restore_flags(flags);
@@ -362,8 +420,8 @@ static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
                        i = inb(dev->iobase + DT2811_ADDATLO);
                        i = inb(dev->iobase + DT2811_ADDATHI);
                        printk("(irq = %d)\n", irq);
-                       ret = comedi_request_irq(irq, dt2811_interrupt, 0,
-                               driver_name, dev);
+                       ret = request_irq(irq, dt2811_interrupt, 0,
+                                         driver_name, dev);
                        if (ret < 0)
                                return -EIO;
                        dev->irq = irq;
@@ -375,10 +433,14 @@ static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
        }
 #endif
 
-       if ((ret = alloc_subdevices(dev, 4)) < 0)
+       ret = alloc_subdevices(dev, 4);
+       if (ret < 0)
                return ret;
-       if ((ret = alloc_private(dev, sizeof(dt2811_private))) < 0)
+
+       ret = alloc_private(dev, sizeof(struct dt2811_private));
+       if (ret < 0)
                return ret;
+
        switch (it->options[2]) {
        case 0:
                devpriv->adc_mux = adc_singleended;
@@ -476,12 +538,12 @@ static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
        return 0;
 }
 
-static int dt2811_detach(struct comedi_device * dev)
+static int dt2811_detach(struct comedi_device *dev)
 {
        printk("comedi%d: dt2811: remove\n", dev->minor);
 
        if (dev->irq) {
-               comedi_free_irq(dev->irq, dev);
+               free_irq(dev->irq, dev);
        }
        if (dev->iobase) {
                release_region(dev->iobase, DT2811_SIZE);
@@ -490,8 +552,8 @@ static int dt2811_detach(struct comedi_device * dev)
        return 0;
 }
 
-static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data)
 {
        int chan = CR_CHAN(insn->chanspec);
        int timeout = DT2811_TIMEOUT;
@@ -501,7 +563,7 @@ static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice *
                outb(chan, dev->iobase + DT2811_ADGCR);
 
                while (timeout
-                       && inb(dev->iobase + DT2811_ADCSR) & DT2811_ADBUSY)
+                      && inb(dev->iobase + DT2811_ADCSR) & DT2811_ADBUSY)
                        timeout--;
                if (!timeout)
                        return -ETIME;
@@ -541,8 +603,8 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig)
 }
 #endif
 
-static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int dt2811_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
+                         struct comedi_insn *insn, unsigned int *data)
 {
        int i;
        int chan;
@@ -552,15 +614,16 @@ static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice *
        for (i = 0; i < insn->n; i++) {
                outb(data[i] & 0xff, dev->iobase + DT2811_DADAT0LO + 2 * chan);
                outb((data[i] >> 8) & 0xff,
-                       dev->iobase + DT2811_DADAT0HI + 2 * chan);
+                    dev->iobase + DT2811_DADAT0HI + 2 * chan);
                devpriv->ao_readback[chan] = data[i];
        }
 
        return i;
 }
 
-static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int dt2811_ao_insn_read(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data)
 {
        int i;
        int chan;
@@ -574,8 +637,9 @@ static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi
        return i;
 }
 
-static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int dt2811_di_insn_bits(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -585,8 +649,9 @@ static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi
        return 2;
 }
 
-static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int dt2811_do_insn_bits(struct comedi_device *dev,
+                              struct comedi_subdevice *s,
+                              struct comedi_insn *insn, unsigned int *data)
 {
        if (insn->n != 2)
                return -EINVAL;