Staging: comedi: Remove comedi_insn typedef

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

diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index ef736ba3fefd1df053a9384ad1069cca1b0c3bba..6494312cb1698d79e3299edee3c48f5595c33002 100644 (file)
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -49,7 +49,6 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 
 #include "../comedidev.h"
 
-#include <linux/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -87,8 +86,8 @@ typedef struct local_info_t {
 
        struct semaphore eos;
 
-       comedi_device *dev;
-       comedi_subdevice *s;
+       struct comedi_device *dev;
+       struct comedi_subdevice *s;
        int count;
 } local_info_t;
 
@@ -184,7 +183,7 @@ static local_info_t *dev_table[MAX_DEV] = { NULL, /* ... */  };
  * +/- 1.25V, and the D/A converter has only one: +/- 5V.
  */
 
-static const comedi_lrange range_daqp_ai = { 4, {
+static const struct comedi_lrange range_daqp_ai = { 4, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2.5),
@@ -192,15 +191,15 @@ static const comedi_lrange range_daqp_ai = { 4, {
        }
 };
 
-static const comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} };
+static const struct comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} };
 
 /*====================================================================*/
 
 /* comedi interface code */
 
-static int daqp_attach(comedi_device * dev, comedi_devconfig * it);
-static int daqp_detach(comedi_device * dev);
-static comedi_driver driver_daqp = {
+static int daqp_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int daqp_detach(struct comedi_device * dev);
+static struct comedi_driver driver_daqp = {
       driver_name:"quatech_daqp_cs",
       module:THIS_MODULE,
       attach:daqp_attach,
@@ -209,7 +208,7 @@ static comedi_driver driver_daqp = {
 
 #ifdef DAQP_DEBUG
 
-static void daqp_dump(comedi_device * dev)
+static void daqp_dump(struct comedi_device * dev)
 {
        printk("DAQP: status %02x; aux status %02x\n",
                inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX));
@@ -235,7 +234,7 @@ static void hex_dump(char *str, void *ptr, int len)
 
 /* Cancel a running acquisition */
 
-static int daqp_ai_cancel(comedi_device * dev, comedi_subdevice * s)
+static int daqp_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        local_info_t *local = (local_info_t *) s->private;
 
@@ -266,8 +265,8 @@ static int daqp_ai_cancel(comedi_device * dev, comedi_subdevice * s)
 static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG)
 {
        local_info_t *local = (local_info_t *) dev_id;
-       comedi_device *dev;
-       comedi_subdevice *s;
+       struct comedi_device *dev;
+       struct comedi_subdevice *s;
        int loop_limit = 10000;
        int status;
 
@@ -285,7 +284,7 @@ static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG)
 
        if (!dev->attached) {
                printk(KERN_WARNING
-                       "daqp_interrupt(): comedi_device not yet attached.\n");
+                       "daqp_interrupt(): struct comedi_device not yet attached.\n");
                return;
        }
 
@@ -314,7 +313,7 @@ static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG)
                while (!((status = inb(dev->iobase + DAQP_STATUS))
                                & DAQP_STATUS_FIFO_EMPTY)) {
 
-                       sampl_t data;
+                       short data;
 
                        if (status & DAQP_STATUS_DATA_LOST) {
                                s->async->events |=
@@ -362,8 +361,8 @@ static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG)
 
 /* One-shot analog data acquisition routine */
 
-static int daqp_ai_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int daqp_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        local_info_t *local = (local_info_t *) s->private;
        int i;
@@ -468,8 +467,8 @@ static int daqp_ns_to_timer(unsigned int *ns, int round)
  * the command passes.
  */
 
-static int daqp_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
-       comedi_cmd * cmd)
+static int daqp_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        int tmp;
@@ -594,10 +593,10 @@ static int daqp_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
        return 0;
 }
 
-static int daqp_ai_cmd(comedi_device * dev, comedi_subdevice * s)
+static int daqp_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        local_info_t *local = (local_info_t *) s->private;
-       comedi_cmd *cmd = &s->async->cmd;
+       struct comedi_cmd *cmd = &s->async->cmd;
        int counter = 100;
        int scanlist_start_on_every_entry;
        int threshold;
@@ -794,8 +793,8 @@ static int daqp_ai_cmd(comedi_device * dev, comedi_subdevice * s)
 
 /* Single-shot analog output routine */
 
-static int daqp_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int daqp_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        local_info_t *local = (local_info_t *) s->private;
        int d;
@@ -821,8 +820,8 @@ static int daqp_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
 
 /* Digital input routine */
 
-static int daqp_di_insn_read(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int daqp_di_insn_read(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        local_info_t *local = (local_info_t *) s->private;
 
@@ -837,8 +836,8 @@ static int daqp_di_insn_read(comedi_device * dev, comedi_subdevice * s,
 
 /* Digital output routine */
 
-static int daqp_do_insn_write(comedi_device * dev, comedi_subdevice * s,
-       comedi_insn * insn, lsampl_t * data)
+static int daqp_do_insn_write(struct comedi_device * dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        local_info_t *local = (local_info_t *) s->private;
 
@@ -857,13 +856,13 @@ static int daqp_do_insn_write(comedi_device * dev, comedi_subdevice * s,
  * when it is inserted.
  */
 
-static int daqp_attach(comedi_device * dev, comedi_devconfig * it)
+static int daqp_attach(struct comedi_device * dev, comedi_devconfig * it)
 {
        int ret;
        local_info_t *local = dev_table[it->options[0]];
        tuple_t tuple;
        int i;
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
 
        if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) {
                printk("comedi%d: No such daqp device %d\n",
@@ -963,7 +962,7 @@ static int daqp_attach(comedi_device * dev, comedi_devconfig * it)
  * card is removed, daqp_cs_detach() is called by the pcmcia subsystem.
  */
 
-static int daqp_detach(comedi_device * dev)
+static int daqp_detach(struct comedi_device * dev)
 {
        printk("comedi%d: detaching daqp\n", dev->minor);