Staging: fix assorted typos all over the place

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / 8255.c

diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index e4920ae..10f488f 100644 (file)
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -105,20 +105,22 @@ struct subdev_8255_struct {
 #define CALLBACK_FUNC  (((struct subdev_8255_struct *)s->private)->cb_func)
 #define subdevpriv     ((struct subdev_8255_struct *)s->private)
 
-static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it);
+static int dev_8255_attach(struct comedi_device *dev,
+                          struct comedi_devconfig *it);
 static int dev_8255_detach(struct comedi_device *dev);
-static comedi_driver driver_8255 = {
-      driver_name:"8255",
-      module:THIS_MODULE,
-      attach:dev_8255_attach,
-      detach:dev_8255_detach,
+static struct comedi_driver driver_8255 = {
+       .driver_name = "8255",
+       .module = THIS_MODULE,
+       .attach = dev_8255_attach,
+       .detach = dev_8255_detach,
 };
 
 COMEDI_INITCLEANUP(driver_8255);
 
-static void do_config(struct comedi_device *dev, struct comedi_subdevice * s);
+static void do_config(struct comedi_device *dev, struct comedi_subdevice *s);
 
-void subdev_8255_interrupt(struct comedi_device *dev, struct comedi_subdevice * s)
+void subdev_8255_interrupt(struct comedi_device *dev,
+                          struct comedi_subdevice *s)
 {
        short d;
 
@@ -130,6 +132,7 @@ void subdev_8255_interrupt(struct comedi_device *dev, struct comedi_subdevice *
 
        comedi_event(dev, s);
 }
+EXPORT_SYMBOL(subdev_8255_interrupt);
 
 static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
 {
@@ -143,8 +146,9 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
        }
 }
 
-static int subdev_8255_insn(struct comedi_device *dev, struct 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];
@@ -152,13 +156,13 @@ static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice *
 
                if (data[0] & 0xff)
                        CALLBACK_FUNC(1, _8255_DATA, s->state & 0xff,
-                               CALLBACK_ARG);
+                                     CALLBACK_ARG);
                if (data[0] & 0xff00)
                        CALLBACK_FUNC(1, _8255_DATA + 1, (s->state >> 8) & 0xff,
-                               CALLBACK_ARG);
+                                     CALLBACK_ARG);
                if (data[0] & 0xff0000)
                        CALLBACK_FUNC(1, _8255_DATA + 2,
-                               (s->state >> 16) & 0xff, CALLBACK_ARG);
+                                     (s->state >> 16) & 0xff, CALLBACK_ARG);
        }
 
        data[1] = CALLBACK_FUNC(0, _8255_DATA, 0, CALLBACK_ARG);
@@ -168,22 +172,22 @@ static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice *
        return 2;
 }
 
-static int subdev_8255_insn_config(struct comedi_device *dev, struct 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;
 
        mask = 1 << CR_CHAN(insn->chanspec);
-       if (mask & 0x0000ff) {
+       if (mask & 0x0000ff)
                bits = 0x0000ff;
-       } else if (mask & 0x00ff00) {
+       else if (mask & 0x00ff00)
                bits = 0x00ff00;
-       } else if (mask & 0x0f0000) {
+       else if (mask & 0x0f0000)
                bits = 0x0f0000;
-       } else {
+       else
                bits = 0xf00000;
-       }
 
        switch (data[0]) {
        case INSN_CONFIG_DIO_INPUT:
@@ -205,7 +209,7 @@ static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subd
        return 1;
 }
 
-static void do_config(struct comedi_device *dev, struct comedi_subdevice * s)
+static void do_config(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        int config;
 
@@ -222,8 +226,9 @@ static void do_config(struct comedi_device *dev, struct comedi_subdevice * s)
        CALLBACK_FUNC(1, _8255_CR, config, CALLBACK_ARG);
 }
 
-static int subdev_8255_cmdtest(struct comedi_device *dev, struct 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,22 +302,25 @@ static int subdev_8255_cmdtest(struct comedi_device *dev, struct comedi_subdevic
        return 0;
 }
 
-static int subdev_8255_cmd(struct comedi_device *dev, struct 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, struct 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, struct comedi_subdevice * s, int (*cb) (int,
-               int, int, unsigned long), unsigned long arg)
+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;
        s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
@@ -325,11 +333,10 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice * s, int
                return -ENOMEM;
 
        CALLBACK_ARG = arg;
-       if (cb == NULL) {
+       if (cb == NULL)
                CALLBACK_FUNC = subdev_8255_cb;
-       } else {
+       else
                CALLBACK_FUNC = cb;
-       }
        s->insn_bits = subdev_8255_insn;
        s->insn_config = subdev_8255_insn_config;
 
@@ -339,9 +346,11 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice * s, int
 
        return 0;
 }
+EXPORT_SYMBOL(subdev_8255_init);
 
-int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice * s,
-       int (*cb) (int, int, int, unsigned long), unsigned long arg)
+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;
 
@@ -357,16 +366,20 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice * s,
 
        return 0;
 }
+EXPORT_SYMBOL(subdev_8255_init_irq);
 
-void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice * s)
+void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        if (s->private) {
-               if (subdevpriv->have_irq) {
-               }
+               /* this test does nothing, so comment it out
+                * if (subdevpriv->have_irq) {
+                * }
+                */
 
                kfree(s->private);
        }
 }
+EXPORT_SYMBOL(subdev_8255_cleanup);
 
 /*
 
@@ -374,7 +387,8 @@ void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice * s)
 
  */
 
-static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it)
+static int dev_8255_attach(struct comedi_device *dev,
+                          struct comedi_devconfig *it)
 {
        int ret;
        unsigned long iobase;
@@ -394,7 +408,8 @@ static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it)
                return -EINVAL;
        }
 
-       if ((ret = alloc_subdevices(dev, i)) < 0)
+       ret = alloc_subdevices(dev, i);
+       if (ret < 0)
                return ret;
 
        for (i = 0; i < dev->n_subdevices; i++) {
@@ -407,7 +422,7 @@ static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it)
                        dev->subdevices[i].type = COMEDI_SUBD_UNUSED;
                } else {
                        subdev_8255_init(dev, dev->subdevices + i, NULL,
-                               iobase);
+                                        iobase);
                }
        }
 
@@ -435,8 +450,3 @@ static int dev_8255_detach(struct comedi_device *dev)
 
        return 0;
 }
-
-EXPORT_SYMBOL(subdev_8255_init);
-EXPORT_SYMBOL(subdev_8255_init_irq);
-EXPORT_SYMBOL(subdev_8255_cleanup);
-EXPORT_SYMBOL(subdev_8255_interrupt);