aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Warden <shane.warden@onyxneon.com>2009-09-22 19:13:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 15:21:49 -0500
commitf36624369ff2922f3aa8b5cef0376bcec759ebef (patch)
treeb5e75593d54488a5a192bbf1e4cef9d98d5af929
parent63a4eca57cacd9043da71287590525261563a1f2 (diff)
Staging: comedi: comedi_compat32: Fixed checkpatch.pl issues
Signed-off-by: Shane Warden <shane.warden@onyxneon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/comedi_compat32.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c
index 9810e37845c..e2d7e697526 100644
--- a/drivers/staging/comedi/comedi_compat32.c
+++ b/drivers/staging/comedi/comedi_compat32.c
@@ -27,7 +27,7 @@
27#define __NO_VERSION__ 27#define __NO_VERSION__
28#include "comedi.h" 28#include "comedi.h"
29#include <linux/smp_lock.h> 29#include <linux/smp_lock.h>
30#include <asm/uaccess.h> 30#include <linux/uaccess.h>
31 31
32#include "comedi_compat32.h" 32#include "comedi_compat32.h"
33 33
@@ -186,8 +186,8 @@ static int compat_rangeinfo(struct file *file, unsigned long arg)
186} 186}
187 187
188/* Copy 32-bit cmd structure to native cmd structure. */ 188/* Copy 32-bit cmd structure to native cmd structure. */
189static int get_compat_cmd(struct comedi_cmd __user * cmd, 189static int get_compat_cmd(struct comedi_cmd __user *cmd,
190 struct comedi32_cmd_struct __user * cmd32) 190 struct comedi32_cmd_struct __user *cmd32)
191{ 191{
192 int err; 192 int err;
193 union { 193 union {
@@ -237,8 +237,8 @@ static int get_compat_cmd(struct comedi_cmd __user * cmd,
237} 237}
238 238
239/* Copy native cmd structure to 32-bit cmd structure. */ 239/* Copy native cmd structure to 32-bit cmd structure. */
240static int put_compat_cmd(struct comedi32_cmd_struct __user * cmd32, 240static int put_compat_cmd(struct comedi32_cmd_struct __user *cmd32,
241 struct comedi_cmd __user * cmd) 241 struct comedi_cmd __user *cmd)
242{ 242{
243 int err; 243 int err;
244 unsigned int temp; 244 unsigned int temp;
@@ -328,8 +328,8 @@ static int compat_cmdtest(struct file *file, unsigned long arg)
328} 328}
329 329
330/* Copy 32-bit insn structure to native insn structure. */ 330/* Copy 32-bit insn structure to native insn structure. */
331static int get_compat_insn(struct comedi_insn __user * insn, 331static int get_compat_insn(struct comedi_insn __user *insn,
332 struct comedi32_insn_struct __user * insn32) 332 struct comedi32_insn_struct __user *insn32)
333{ 333{
334 int err; 334 int err;
335 union { 335 union {
@@ -372,9 +372,9 @@ static int compat_insnlist(struct file *file, unsigned long arg)
372 insnlist32 = compat_ptr(arg); 372 insnlist32 = compat_ptr(arg);
373 373
374 /* Get 32-bit insnlist structure. */ 374 /* Get 32-bit insnlist structure. */
375 if (!access_ok(VERIFY_READ, insnlist32, sizeof(*insnlist32))) { 375 if (!access_ok(VERIFY_READ, insnlist32, sizeof(*insnlist32)))
376 return -EFAULT; 376 return -EFAULT;
377 } 377
378 err = 0; 378 err = 0;
379 err |= __get_user(n_insns, &insnlist32->n_insns); 379 err |= __get_user(n_insns, &insnlist32->n_insns);
380 err |= __get_user(uptr, &insnlist32->insns); 380 err |= __get_user(uptr, &insnlist32->insns);
@@ -387,9 +387,9 @@ static int compat_insnlist(struct file *file, unsigned long arg)
387 insn[n_insns])); 387 insn[n_insns]));
388 388
389 /* Set native insnlist structure. */ 389 /* Set native insnlist structure. */
390 if (!access_ok(VERIFY_WRITE, &s->insnlist, sizeof(s->insnlist))) { 390 if (!access_ok(VERIFY_WRITE, &s->insnlist, sizeof(s->insnlist)))
391 return -EFAULT; 391 return -EFAULT;
392 } 392
393 err |= __put_user(n_insns, &s->insnlist.n_insns); 393 err |= __put_user(n_insns, &s->insnlist.n_insns);
394 err |= __put_user(&s->insn[0], &s->insnlist.insns); 394 err |= __put_user(&s->insn[0], &s->insnlist.insns);
395 if (err) 395 if (err)