Staging: comedi: Remove comedi_insn typedef

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

diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index 3355468266a2c74703c482f4ce71909250b83558..ec5f9167110b9feb9402be595cb2b50d711d6666 100644 (file)
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -107,7 +107,7 @@ struct subdev_8255_struct {
 
 static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it);
 static int dev_8255_detach(struct comedi_device *dev);
-static comedi_driver driver_8255 = {
+static struct comedi_driver driver_8255 = {
       driver_name:"8255",
       module:THIS_MODULE,
       attach:dev_8255_attach,
@@ -116,9 +116,9 @@ static comedi_driver driver_8255 = {
 
 COMEDI_INITCLEANUP(driver_8255);
 
-static void do_config(struct comedi_device *dev, comedi_subdevice * s);
+static void do_config(struct comedi_device *dev, struct comedi_subdevice * s);
 
-void subdev_8255_interrupt(struct comedi_device *dev, comedi_subdevice * s)
+void subdev_8255_interrupt(struct comedi_device *dev, struct comedi_subdevice * s)
 {
        short d;
 
@@ -143,8 +143,8 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
        }
 }
 
-static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        if (data[0]) {
                s->state &= ~data[0];
@@ -168,8 +168,8 @@ static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s,
        return 2;
 }
 
-static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int mask;
        unsigned int bits;
@@ -205,7 +205,7 @@ static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice *
        return 1;
 }
 
-static void do_config(struct comedi_device *dev, comedi_subdevice * s)
+static void do_config(struct comedi_device *dev, struct comedi_subdevice * s)
 {
        int config;
 
@@ -222,8 +222,8 @@ static void do_config(struct comedi_device *dev, comedi_subdevice * s)
        CALLBACK_FUNC(1, _8255_CR, config, CALLBACK_ARG);
 }
 
-static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s,
-       comedi_cmd * cmd)
+static int subdev_8255_cmdtest(struct comedi_device *dev, struct comedi_subdevice * s,
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        unsigned int tmp;
@@ -297,21 +297,21 @@ static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s,
        return 0;
 }
 
-static int subdev_8255_cmd(struct comedi_device *dev, comedi_subdevice * s)
+static int subdev_8255_cmd(struct comedi_device *dev, struct comedi_subdevice * s)
 {
        /* FIXME */
 
        return 0;
 }
 
-static int subdev_8255_cancel(struct comedi_device *dev, comedi_subdevice * s)
+static int subdev_8255_cancel(struct comedi_device *dev, struct comedi_subdevice * s)
 {
        /* FIXME */
 
        return 0;
 }
 
-int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb) (int,
+int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice * s, int (*cb) (int,
                int, int, unsigned long), unsigned long arg)
 {
        s->type = COMEDI_SUBD_DIO;
@@ -340,7 +340,7 @@ int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb)
        return 0;
 }
 
-int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s,
+int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice * s,
        int (*cb) (int, int, int, unsigned long), unsigned long arg)
 {
        int ret;
@@ -358,7 +358,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s,
        return 0;
 }
 
-void subdev_8255_cleanup(struct comedi_device *dev, comedi_subdevice * s)
+void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice * s)
 {
        if (s->private) {
                if (subdevpriv->have_irq) {
@@ -420,7 +420,7 @@ static int dev_8255_detach(struct comedi_device *dev)
 {
        int i;
        unsigned long iobase;
-       comedi_subdevice *s;
+       struct comedi_subdevice *s;
 
        printk("comedi%d: 8255: remove\n", dev->minor);