diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-20 21:34:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:18 -0700 |
| commit | 0191492309432aab9c1e224691dcb05a3563726a (patch) | |
| tree | 1feb8d326e002f057700985d357fd5522ba0bd1f | |
| parent | 180027136b30d25f3824573e77c080056dc3e6d4 (diff) | |
| download | kernel_samsung_smdk4412-0191492309432aab9c1e224691dcb05a3563726a.zip kernel_samsung_smdk4412-0191492309432aab9c1e224691dcb05a3563726a.tar.gz kernel_samsung_smdk4412-0191492309432aab9c1e224691dcb05a3563726a.tar.bz2 | |
Staging: comedi: fix 64bit build errors
This patch fixes the 64bit build errors in the comedi code.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/comedi_compat32.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c index 2fa771e..1b9c2a7 100644 --- a/drivers/staging/comedi/comedi_compat32.c +++ b/drivers/staging/comedi/comedi_compat32.c @@ -37,16 +37,16 @@ #include <linux/ioctl32.h> /* for (un)register_ioctl32_conversion */ #endif -#define COMEDI32_CHANINFO _IOR(CIO, 3, comedi32_chaninfo) -#define COMEDI32_RANGEINFO _IOR(CIO, 8, (struct comedi32_rangeinfo_struct)) +#define COMEDI32_CHANINFO _IOR(CIO, 3, struct comedi32_chaninfo_struct) +#define COMEDI32_RANGEINFO _IOR(CIO, 8, struct comedi32_rangeinfo_struct) /* N.B. COMEDI32_CMD and COMEDI_CMD ought to use _IOWR, not _IOR. * It's too late to change it now, but it only affects the command number. */ -#define COMEDI32_CMD _IOR(CIO, 9, (struct comedi32_cmd_struct)) +#define COMEDI32_CMD _IOR(CIO, 9, struct comedi32_cmd_struct) /* N.B. COMEDI32_CMDTEST and COMEDI_CMDTEST ought to use _IOWR, not _IOR. * It's too late to change it now, but it only affects the command number. */ -#define COMEDI32_CMDTEST _IOR(CIO, 10, (struct comedi32_cmd_struct)) -#define COMEDI32_INSNLIST _IOR(CIO, 11, (struct comedi32_insnlist_struct)) -#define COMEDI32_INSN _IOR(CIO, 12, (struct comedi32_insn_struct)) +#define COMEDI32_CMDTEST _IOR(CIO, 10, struct comedi32_cmd_struct) +#define COMEDI32_INSNLIST _IOR(CIO, 11, struct comedi32_insnlist_struct) +#define COMEDI32_INSN _IOR(CIO, 12, struct comedi32_insn_struct) struct comedi32_chaninfo_struct { unsigned int subdev; @@ -123,7 +123,7 @@ static int translated_ioctl(struct file *file, unsigned int cmd, /* Handle 32-bit COMEDI_CHANINFO ioctl. */ static int compat_chaninfo(struct file *file, unsigned long arg) { - struct comedi_chaninfo_struct __user *chaninfo; + struct comedi_chaninfo __user *chaninfo; struct comedi32_chaninfo_struct __user *chaninfo32; int err; union { |