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

[pandora-kernel.git] / drivers / staging / comedi / comedi_compat32.c

diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c
index 1b9c2a7..9810e37 100644 (file)
--- a/drivers/staging/comedi/comedi_compat32.c
+++ b/drivers/staging/comedi/comedi_compat32.c
@@ -51,7 +51,7 @@
 struct comedi32_chaninfo_struct {
        unsigned int subdev;
        compat_uptr_t maxdata_list;     /* 32-bit 'unsigned int *' */
-       compat_uptr_t flaglist;         /* 32-bit 'unsigned int *' */
+       compat_uptr_t flaglist; /* 32-bit 'unsigned int *' */
        compat_uptr_t rangelist;        /* 32-bit 'unsigned int *' */
        unsigned int unused[4];
 };
@@ -74,16 +74,16 @@ struct comedi32_cmd_struct {
        unsigned int scan_end_arg;
        unsigned int stop_src;
        unsigned int stop_arg;
-       compat_uptr_t chanlist;         /* 32-bit 'unsigned int *' */
+       compat_uptr_t chanlist; /* 32-bit 'unsigned int *' */
        unsigned int chanlist_len;
-       compat_uptr_t data;             /* 32-bit 'short *' */
+       compat_uptr_t data;     /* 32-bit 'short *' */
        unsigned int data_len;
 };
 
 struct comedi32_insn_struct {
        unsigned int insn;
        unsigned int n;
-       compat_uptr_t data;             /* 32-bit 'unsigned int *' */
+       compat_uptr_t data;     /* 32-bit 'unsigned int *' */
        unsigned int subdev;
        unsigned int chanspec;
        unsigned int unused[3];
@@ -91,19 +91,19 @@ struct comedi32_insn_struct {
 
 struct comedi32_insnlist_struct {
        unsigned int n_insns;
-       compat_uptr_t insns;            /* 32-bit 'struct comedi_insn *' */
+       compat_uptr_t insns;    /* 32-bit 'struct comedi_insn *' */
 };
 
 /* Handle translated ioctl. */
 static int translated_ioctl(struct file *file, unsigned int cmd,
-               unsigned long arg)
+                           unsigned long arg)
 {
        if (!file->f_op)
                return -ENOTTY;
 
 #ifdef HAVE_UNLOCKED_IOCTL
        if (file->f_op->unlocked_ioctl) {
-               int rc = (int)(*file->f_op->unlocked_ioctl)(file, cmd, arg);
+               int rc = (int)(*file->f_op->unlocked_ioctl) (file, cmd, arg);
                if (rc == -ENOIOCTLCMD)
                        rc = -ENOTTY;
                return rc;
@@ -112,8 +112,8 @@ static int translated_ioctl(struct file *file, unsigned int cmd,
        if (file->f_op->ioctl) {
                int rc;
                lock_kernel();
-               rc = (*file->f_op->ioctl)(file->f_dentry->d_inode,
-                               file, cmd, arg);
+               rc = (*file->f_op->ioctl) (file->f_dentry->d_inode,
+                                          file, cmd, arg);
                unlock_kernel();
                return rc;
        }
@@ -136,8 +136,7 @@ static int compat_chaninfo(struct file *file, unsigned long arg)
 
        /* Copy chaninfo structure.  Ignore unused members. */
        if (!access_ok(VERIFY_READ, chaninfo32, sizeof(*chaninfo32))
-                       || !access_ok(VERIFY_WRITE, chaninfo,
-                               sizeof(*chaninfo))) {
+           || !access_ok(VERIFY_WRITE, chaninfo, sizeof(*chaninfo))) {
                return -EFAULT;
        }
        err = 0;
@@ -171,8 +170,7 @@ static int compat_rangeinfo(struct file *file, unsigned long arg)
 
        /* Copy rangeinfo structure. */
        if (!access_ok(VERIFY_READ, rangeinfo32, sizeof(*rangeinfo32))
-                       || !access_ok(VERIFY_WRITE, rangeinfo,
-                               sizeof(*rangeinfo))) {
+           || !access_ok(VERIFY_WRITE, rangeinfo, sizeof(*rangeinfo))) {
                return -EFAULT;
        }
        err = 0;
@@ -184,12 +182,12 @@ static int compat_rangeinfo(struct file *file, unsigned long arg)
                return -EFAULT;
 
        return translated_ioctl(file, COMEDI_RANGEINFO,
-                       (unsigned long)rangeinfo);
+                               (unsigned long)rangeinfo);
 }
 
 /* Copy 32-bit cmd structure to native cmd structure. */
-static int get_compat_cmd(struct comedi_cmd __user *cmd,
-               struct comedi32_cmd_struct __user *cmd32)
+static int get_compat_cmd(struct comedi_cmd __user * cmd,
+                         struct comedi32_cmd_struct __user * cmd32)
 {
        int err;
        union {
@@ -199,7 +197,7 @@ static int get_compat_cmd(struct comedi_cmd __user *cmd,
 
        /* Copy cmd structure. */
        if (!access_ok(VERIFY_READ, cmd32, sizeof(*cmd32))
-                       || !access_ok(VERIFY_WRITE, cmd, sizeof(*cmd))) {
+           || !access_ok(VERIFY_WRITE, cmd, sizeof(*cmd))) {
                return -EFAULT;
        }
        err = 0;
@@ -239,7 +237,8 @@ static int get_compat_cmd(struct comedi_cmd __user *cmd,
 }
 
 /* Copy native cmd structure to 32-bit cmd structure. */
-static int put_compat_cmd(struct comedi32_cmd_struct __user *cmd32, struct comedi_cmd __user *cmd)
+static int put_compat_cmd(struct comedi32_cmd_struct __user * cmd32,
+                         struct comedi_cmd __user * cmd)
 {
        int err;
        unsigned int temp;
@@ -249,7 +248,7 @@ static int put_compat_cmd(struct comedi32_cmd_struct __user *cmd32, struct comed
        /* (Could use ptr_to_compat() to set them, but that wasn't implemented
         * until kernel version 2.6.11.) */
        if (!access_ok(VERIFY_READ, cmd, sizeof(*cmd))
-                       || !access_ok(VERIFY_WRITE, cmd32, sizeof(*cmd32))) {
+           || !access_ok(VERIFY_WRITE, cmd32, sizeof(*cmd32))) {
                return -EFAULT;
        }
        err = 0;
@@ -329,8 +328,8 @@ static int compat_cmdtest(struct file *file, unsigned long arg)
 }
 
 /* Copy 32-bit insn structure to native insn structure. */
-static int get_compat_insn(struct comedi_insn __user *insn,
-               struct comedi32_insn_struct __user *insn32)
+static int get_compat_insn(struct comedi_insn __user * insn,
+                          struct comedi32_insn_struct __user * insn32)
 {
        int err;
        union {
@@ -341,7 +340,7 @@ static int get_compat_insn(struct comedi_insn __user *insn,
        /* Copy insn structure.  Ignore the unused members. */
        err = 0;
        if (!access_ok(VERIFY_READ, insn32, sizeof(*insn32))
-                       || !access_ok(VERIFY_WRITE, insn, sizeof(*insn)))
+           || !access_ok(VERIFY_WRITE, insn, sizeof(*insn)))
                return -EFAULT;
 
        err |= __get_user(temp.uint, &insn32->insn);
@@ -385,7 +384,7 @@ static int compat_insnlist(struct file *file, unsigned long arg)
 
        /* Allocate user memory to copy insnlist and insns into. */
        s = compat_alloc_user_space(offsetof(struct combined_insnlist,
-                               insn[n_insns]));
+                                            insn[n_insns]));
 
        /* Set native insnlist structure. */
        if (!access_ok(VERIFY_WRITE, &s->insnlist, sizeof(s->insnlist))) {
@@ -404,7 +403,7 @@ static int compat_insnlist(struct file *file, unsigned long arg)
        }
 
        return translated_ioctl(file, COMEDI_INSNLIST,
-                       (unsigned long)&s->insnlist);
+                               (unsigned long)&s->insnlist);
 }
 
 /* Handle 32-bit COMEDI_INSN ioctl. */
@@ -427,7 +426,7 @@ static int compat_insn(struct file *file, unsigned long arg)
 /* Process untranslated ioctl. */
 /* Returns -ENOIOCTLCMD for unrecognised ioctl codes. */
 static inline int raw_ioctl(struct file *file, unsigned int cmd,
-               unsigned long arg)
+                           unsigned long arg)
 {
        int rc;
 
@@ -477,8 +476,7 @@ static inline int raw_ioctl(struct file *file, unsigned int cmd,
 
 /* compat_ioctl file operation. */
 /* Returns -ENOIOCTLCMD for unrecognised ioctl codes. */
-long comedi_compat_ioctl(struct file *file, unsigned int cmd,
-               unsigned long arg)
+long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        return raw_ioctl(file, cmd, arg);
 }
@@ -497,7 +495,7 @@ long comedi_compat_ioctl(struct file *file, unsigned int cmd,
 
 /* Handler for all 32-bit ioctl codes registered by this driver. */
 static int mapped_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,
-               struct file *file)
+                       struct file *file)
 {
        int rc;
 
@@ -515,27 +513,27 @@ static int mapped_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,
 
 struct ioctl32_map {
        unsigned int cmd;
-       int (*handler)(unsigned int, unsigned int, unsigned long,
+       int (*handler) (unsigned int, unsigned int, unsigned long,
                        struct file *);
        int registered;
 };
 
 static struct ioctl32_map comedi_ioctl32_map[] = {
-       { COMEDI_DEVCONFIG, mapped_ioctl, 0 },
-       { COMEDI_DEVINFO, mapped_ioctl, 0 },
-       { COMEDI_SUBDINFO, mapped_ioctl, 0 },
-       { COMEDI_BUFCONFIG, mapped_ioctl, 0 },
-       { COMEDI_BUFINFO, mapped_ioctl, 0 },
-       { COMEDI_LOCK, mapped_ioctl, 0 },
-       { COMEDI_UNLOCK, mapped_ioctl, 0 },
-       { COMEDI_CANCEL, mapped_ioctl, 0 },
-       { COMEDI_POLL, mapped_ioctl, 0 },
-       { COMEDI32_CHANINFO, mapped_ioctl, 0 },
-       { COMEDI32_RANGEINFO, mapped_ioctl, 0 },
-       { COMEDI32_CMD, mapped_ioctl, 0 },
-       { COMEDI32_CMDTEST, mapped_ioctl, 0 },
-       { COMEDI32_INSNLIST, mapped_ioctl, 0 },
-       { COMEDI32_INSN, mapped_ioctl, 0 },
+       {COMEDI_DEVCONFIG, mapped_ioctl, 0},
+       {COMEDI_DEVINFO, mapped_ioctl, 0},
+       {COMEDI_SUBDINFO, mapped_ioctl, 0},
+       {COMEDI_BUFCONFIG, mapped_ioctl, 0},
+       {COMEDI_BUFINFO, mapped_ioctl, 0},
+       {COMEDI_LOCK, mapped_ioctl, 0},
+       {COMEDI_UNLOCK, mapped_ioctl, 0},
+       {COMEDI_CANCEL, mapped_ioctl, 0},
+       {COMEDI_POLL, mapped_ioctl, 0},
+       {COMEDI32_CHANINFO, mapped_ioctl, 0},
+       {COMEDI32_RANGEINFO, mapped_ioctl, 0},
+       {COMEDI32_CMD, mapped_ioctl, 0},
+       {COMEDI32_CMDTEST, mapped_ioctl, 0},
+       {COMEDI32_INSNLIST, mapped_ioctl, 0},
+       {COMEDI32_INSN, mapped_ioctl, 0},
 };
 
 #define NUM_IOCTL32_MAPS ARRAY_SIZE(comedi_ioctl32_map)
@@ -547,13 +545,13 @@ void comedi_register_ioctl32(void)
 
        for (n = 0; n < NUM_IOCTL32_MAPS; n++) {
                rc = register_ioctl32_conversion(comedi_ioctl32_map[n].cmd,
-                               comedi_ioctl32_map[n].handler);
+                                                comedi_ioctl32_map[n].handler);
                if (rc) {
                        printk(KERN_WARNING
-                                       "comedi: failed to register 32-bit "
-                                       "compatible ioctl handler for 0x%X - "
-                                       "expect bad things to happen!\n",
-                                       comedi_ioctl32_map[n].cmd);
+                              "comedi: failed to register 32-bit "
+                              "compatible ioctl handler for 0x%X - "
+                              "expect bad things to happen!\n",
+                              comedi_ioctl32_map[n].cmd);
                }
                comedi_ioctl32_map[n].registered = !rc;
        }
@@ -566,15 +564,16 @@ void comedi_unregister_ioctl32(void)
 
        for (n = 0; n < NUM_IOCTL32_MAPS; n++) {
                if (comedi_ioctl32_map[n].registered) {
-                       rc = unregister_ioctl32_conversion(
-                                       comedi_ioctl32_map[n].cmd,
-                                       comedi_ioctl32_map[n].handler);
+                       rc = unregister_ioctl32_conversion(comedi_ioctl32_map
+                                                          [n].cmd,
+                                                          comedi_ioctl32_map
+                                                          [n].handler);
                        if (rc) {
                                printk(KERN_ERR
-                                       "comedi: failed to unregister 32-bit "
-                                       "compatible ioctl handler for 0x%X - "
-                                       "expect kernel Oops!\n",
-                                       comedi_ioctl32_map[n].cmd);
+                                      "comedi: failed to unregister 32-bit "
+                                      "compatible ioctl handler for 0x%X - "
+                                      "expect kernel Oops!\n",
+                                      comedi_ioctl32_map[n].cmd);
                        } else {
                                comedi_ioctl32_map[n].registered = 0;
                        }
@@ -582,6 +581,6 @@ void comedi_unregister_ioctl32(void)
        }
 }
 
-#endif /* HAVE_COMPAT_IOCTL */
+#endif /* HAVE_COMPAT_IOCTL */
 
-#endif /* CONFIG_COMPAT */
+#endif /* CONFIG_COMPAT */