Staging: comedi: Remove comedi_insn typedef

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

diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index d87fd21a3bb6caa6b737d5a806894c007e027216..ea1fd6ec699d8ce4cb99a4cc9d48dc04e20618ef 100644 (file)
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -38,7 +38,7 @@ significantly different.
 
 I was _barely_ able to reach the full 1 MHz capability
 of this board, using a hard real-time interrupt
-(set the TRIG_RT flag in your comedi_cmd and use
+(set the TRIG_RT flag in your struct comedi_cmd and use
 rtlinux or RTAI).  The board can't do dma, so the bottleneck is
 pulling the data across the ISA bus.  I timed the interrupt
 handler, and it took my computer ~470 microseconds to pull 512
@@ -117,7 +117,7 @@ irq can be omitted, although the cmd interface will not work without it.
 #define DAS16M1_82C55                  0x400
 #define DAS16M1_8254_THIRD             0x404
 
-static const comedi_lrange range_das16m1 = { 9,
+static const struct comedi_lrange range_das16m1 = { 9,
        {
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
@@ -132,14 +132,14 @@ static const comedi_lrange range_das16m1 = { 9,
 };
 
 static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 
 static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd);
+       struct comedi_cmd * cmd);
 static int das16m1_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s);
 static int das16m1_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
 
@@ -201,7 +201,7 @@ static inline short munge_sample(short data)
 }
 
 static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd)
+       struct comedi_cmd * cmd)
 {
        unsigned int err = 0, tmp, i;
 
@@ -325,7 +325,7 @@ static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice
 static int das16m1_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        struct comedi_async *async = s->async;
-       comedi_cmd *cmd = &async->cmd;
+       struct comedi_cmd *cmd = &async->cmd;
        unsigned int byte, i;
 
        if (dev->irq == 0) {
@@ -394,7 +394,7 @@ static int das16m1_cancel(struct comedi_device * dev, struct comedi_subdevice *
 }
 
 static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i, n;
        int byte;
@@ -431,7 +431,7 @@ static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice
 }
 
 static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int bits;
 
@@ -443,7 +443,7 @@ static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice
 }
 
 static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int wbits;
 
@@ -518,7 +518,7 @@ static void das16m1_handler(struct comedi_device * dev, unsigned int status)
 {
        struct comedi_subdevice *s;
        struct comedi_async *async;
-       comedi_cmd *cmd;
+       struct comedi_cmd *cmd;
        u16 num_samples;
        u16 hw_counter;