Staging: Comedi: Lindent changes to comdi driver in staging tree

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

diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index 23263ed..abb0532 100644 (file)
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -97,13 +97,14 @@ union encvaluetype {
 
 #define C6XDIGIO_TIME_OUT 20
 
-static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *it);
+static int c6xdigio_attach(struct comedi_device *dev,
+                          struct comedi_devconfig *it);
 static int c6xdigio_detach(struct comedi_device *dev);
 struct comedi_driver driver_c6xdigio = {
-      driver_name:"c6xdigio",
-      module:THIS_MODULE,
-      attach:c6xdigio_attach,
-      detach:c6xdigio_detach,
+       .driver_name = "c6xdigio",
+       .module = THIS_MODULE,
+       .attach = c6xdigio_attach,
+       .detach = c6xdigio_detach,
 };
 
 static void C6X_pwmInit(unsigned long baseAddr)
@@ -114,28 +115,28 @@ static void C6X_pwmInit(unsigned long baseAddr)
 
        WriteByteToHwPort(baseAddr, 0x70);
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
 
        WriteByteToHwPort(baseAddr, 0x74);
        timeout = 0;
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
 
        WriteByteToHwPort(baseAddr, 0x70);
        timeout = 0;
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x0)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
 
        WriteByteToHwPort(baseAddr, 0x0);
        timeout = 0;
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
 
@@ -304,7 +305,7 @@ static int C6X_encInput(unsigned long baseAddr, unsigned channel)
                timeout++;
        }
 
-       return (enc.value ^ 0x800000);
+       return enc.value ^ 0x800000;
 }
 
 static void C6X_encResetAll(unsigned long baseAddr)
@@ -315,38 +316,41 @@ static void C6X_encResetAll(unsigned long baseAddr)
 
        WriteByteToHwPort(baseAddr, 0x68);
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
        WriteByteToHwPort(baseAddr, 0x6C);
        timeout = 0;
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
        WriteByteToHwPort(baseAddr, 0x68);
        timeout = 0;
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x0)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
        WriteByteToHwPort(baseAddr, 0x0);
        timeout = 0;
        while (((ReadByteFromHwPort(baseAddr + 1) & 0x80) == 0x80)
-               && (timeout < C6XDIGIO_TIME_OUT)) {
+              && (timeout < C6XDIGIO_TIME_OUT)) {
                timeout++;
        }
 }
 
 static int c6xdigio_pwmo_insn_read(struct comedi_device *dev,
-       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+                                  struct comedi_subdevice *s,
+                                  struct comedi_insn *insn, unsigned int *data)
 {
        printk("c6xdigio_pwmo_insn_read %x\n", insn->n);
        return insn->n;
 }
 
 static int c6xdigio_pwmo_insn_write(struct comedi_device *dev,
-       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+                                   struct comedi_subdevice *s,
+                                   struct comedi_insn *insn,
+                                   unsigned int *data)
 {
        int i;
        int chan = CR_CHAN(insn->chanspec);
@@ -375,12 +379,13 @@ static int c6xdigio_pwmo_insn_write(struct comedi_device *dev,
 /* { */
 /* int i; */
 /* int chan = CR_CHAN(insn->chanspec); */
-/*  *//* C6X_encResetAll( dev->iobase ); */
-/*  *//* return insn->n; */
+      /*  *//* C6X_encResetAll( dev->iobase ); */
+      /*  *//* return insn->n; */
 /* } */
 
 static int c6xdigio_ei_insn_read(struct comedi_device *dev,
-       struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+                                struct comedi_subdevice *s,
+                                struct comedi_insn *insn, unsigned int *data)
 {
        /*   printk("c6xdigio_ei__insn_read %x\n", insn->n); */
        int n;
@@ -426,7 +431,8 @@ static struct pnp_driver c6xdigio_pnp_driver = {
        .id_table = c6xdigio_pnp_tbl,
 };
 
-static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+static int c6xdigio_attach(struct comedi_device *dev,
+                          struct comedi_devconfig *it)
 {
        int result = 0;
        unsigned long iobase;
@@ -478,7 +484,7 @@ static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *i
        s->range_table = &range_unknown;
 
        /*           s = dev->subdevices + 2; */
-             /* pwm output subdevice */
+       /* pwm output subdevice */
        /*       s->type = COMEDI_SUBD_COUNTER;  // Not sure what to put here */
        /*       s->subdev_flags = SDF_WRITEABLE; */
        /*       s->n_chan = 1; */