Staging: comedi: Remove comedi_insn typedef

[deliverable/linux.git] / drivers / staging / comedi / drivers / das800.c

diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 73068309ae9c0b13dc6396f962e932e1081ebb4f..179a694b0745dfe8d6645f8d653d769d937f54d8 100644 (file)
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -109,19 +109,19 @@ cmd triggers supported:
 typedef struct das800_board_struct {
        const char *name;
        int ai_speed;
-       const comedi_lrange *ai_range;
+       const struct comedi_lrange *ai_range;
        int resolution;
 } das800_board;
 
 //analog input ranges
-static const comedi_lrange range_das800_ai = {
+static const struct comedi_lrange range_das800_ai = {
        1,
        {
                        RANGE(-5, 5),
                }
 };
 
-static const comedi_lrange range_das801_ai = {
+static const struct comedi_lrange range_das801_ai = {
        9,
        {
                        RANGE(-5, 5),
@@ -136,7 +136,7 @@ static const comedi_lrange range_das801_ai = {
                }
 };
 
-static const comedi_lrange range_cio_das801_ai = {
+static const struct comedi_lrange range_cio_das801_ai = {
        9,
        {
                        RANGE(-5, 5),
@@ -151,7 +151,7 @@ static const comedi_lrange range_cio_das801_ai = {
                }
 };
 
-static const comedi_lrange range_das802_ai = {
+static const struct comedi_lrange range_das802_ai = {
        9,
        {
                        RANGE(-5, 5),
@@ -166,7 +166,7 @@ static const comedi_lrange range_das802_ai = {
                }
 };
 
-static const comedi_lrange range_das80216_ai = {
+static const struct comedi_lrange range_das80216_ai = {
        8,
        {
                        RANGE(-10, 10),
@@ -244,9 +244,9 @@ typedef struct {
 
 static int das800_attach(struct comedi_device * dev, comedi_devconfig * it);
 static int das800_detach(struct comedi_device * dev);
-static int das800_cancel(struct comedi_device * dev, comedi_subdevice * s);
+static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
 
-static comedi_driver driver_das800 = {
+static struct comedi_driver driver_das800 = {
       driver_name:"das800",
       module:THIS_MODULE,
       attach:das800_attach,
@@ -259,15 +259,15 @@ static comedi_driver driver_das800 = {
 static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG);
 static void enable_das800(struct comedi_device * dev);
 static void disable_das800(struct comedi_device * dev);
-static int das800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_cmd * cmd);
-static int das800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s);
-static int das800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int das800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
-static int das800_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd);
+static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s);
+static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
+static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
 static int das800_probe(struct comedi_device * dev);
 static int das800_set_frequency(struct comedi_device * dev);
 
@@ -348,8 +348,8 @@ static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG)
        short i;                /* loop index */
        short dataPoint = 0;
        struct comedi_device *dev = d;
-       comedi_subdevice *s = dev->read_subdev; /* analog input subdevice */
-       comedi_async *async;
+       struct comedi_subdevice *s = dev->read_subdev;  /* analog input subdevice */
+       struct comedi_async *async;
        int status;
        unsigned long irq_flags;
        static const int max_loops = 128;       // half-fifo size for cio-das802/16
@@ -443,7 +443,7 @@ static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG)
 
 static int das800_attach(struct comedi_device * dev, comedi_devconfig * it)
 {
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
        unsigned long iobase = it->options[0];
        unsigned int irq = it->options[1];
        unsigned long irq_flags;
@@ -551,7 +551,7 @@ static int das800_detach(struct comedi_device * dev)
        return 0;
 };
 
-static int das800_cancel(struct comedi_device * dev, comedi_subdevice * s)
+static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        devpriv->forever = 0;
        devpriv->count = 0;
@@ -584,8 +584,8 @@ static void disable_das800(struct comedi_device * dev)
        comedi_spin_unlock_irqrestore(&dev->spinlock, irq_flags);
 }
 
-static int das800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_cmd * cmd)
+static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        int tmp;
@@ -709,12 +709,12 @@ static int das800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s
        return 0;
 }
 
-static int das800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s)
+static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        int startChan, endChan, scan, gain;
        int conv_bits;
        unsigned long irq_flags;
-       comedi_async *async = s->async;
+       struct comedi_async *async = s->async;
 
        if (!dev->irq) {
                comedi_error(dev,
@@ -788,8 +788,8 @@ static int das800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s)
        return 0;
 }
 
-static int das800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i, n;
        int chan;
@@ -842,8 +842,8 @@ static int das800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
        return n;
 }
 
-static int das800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int bits;
 
@@ -855,8 +855,8 @@ static int das800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
        return 2;
 }
 
-static int das800_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        int wbits;
        unsigned long irq_flags;