diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:06:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:58 -0700 |
| commit | d0a353f637593ce8b0e08848cc7c871b766cb4ee (patch) | |
| tree | 6dfbb62c00351c0ca8da0e6bea04f0fc3925a276 /drivers/staging/comedi | |
| parent | 0707bb04be89b18ee83b5a997e36cc585f0b988d (diff) | |
| download | kernel_samsung_smdk4412-d0a353f637593ce8b0e08848cc7c871b766cb4ee.zip kernel_samsung_smdk4412-d0a353f637593ce8b0e08848cc7c871b766cb4ee.tar.gz kernel_samsung_smdk4412-d0a353f637593ce8b0e08848cc7c871b766cb4ee.tar.bz2 | |
Staging: comedi: Remove comedi_rangeinfo typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/comedi.h | 5 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_compat32.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/range.c | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index fe7f1c4..82298fa 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -299,7 +299,7 @@ enum comedi_support_level { #define COMEDI_LOCK _IO(CIO, 5) #define COMEDI_UNLOCK _IO(CIO, 6) #define COMEDI_CANCEL _IO(CIO, 7) -#define COMEDI_RANGEINFO _IOR(CIO, 8, comedi_rangeinfo) +#define COMEDI_RANGEINFO _IOR(CIO, 8, struct comedi_rangeinfo) #define COMEDI_CMD _IOR(CIO, 9, struct comedi_cmd) #define COMEDI_CMDTEST _IOR(CIO, 10, struct comedi_cmd) #define COMEDI_INSNLIST _IOR(CIO, 11, struct comedi_insnlist) @@ -310,7 +310,6 @@ enum comedi_support_level { /* structures */ -typedef struct comedi_rangeinfo_struct comedi_rangeinfo; typedef struct comedi_krange_struct comedi_krange; typedef struct comedi_bufconfig_struct comedi_bufconfig; typedef struct comedi_bufinfo_struct comedi_bufinfo; @@ -378,7 +377,7 @@ struct comedi_chaninfo { unsigned int unused[4]; }; -struct comedi_rangeinfo_struct { +struct comedi_rangeinfo { unsigned int range_type; void *range_ptr; }; diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c index f3cedb5..2fa771e 100644 --- a/drivers/staging/comedi/comedi_compat32.c +++ b/drivers/staging/comedi/comedi_compat32.c @@ -158,7 +158,7 @@ static int compat_chaninfo(struct file *file, unsigned long arg) /* Handle 32-bit COMEDI_RANGEINFO ioctl. */ static int compat_rangeinfo(struct file *file, unsigned long arg) { - comedi_rangeinfo __user *rangeinfo; + struct comedi_rangeinfo __user *rangeinfo; struct comedi32_rangeinfo_struct __user *rangeinfo32; int err; union { diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index e6a3005..15e457a 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -375,7 +375,7 @@ enum subdevice_runflags { various internal comedi functions */ -int do_rangeinfo_ioctl(struct comedi_device *dev, comedi_rangeinfo *arg); +int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg); int check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist); void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask, unsigned bits); diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c index ef7ad56..3778873 100644 --- a/drivers/staging/comedi/range.c +++ b/drivers/staging/comedi/range.c @@ -44,14 +44,14 @@ const struct comedi_lrange range_unknown = { 1, {{0, 1000000, UNIT_none}} }; writes: n comedi_krange structures to rangeinfo->range_ptr */ -int do_rangeinfo_ioctl(struct comedi_device *dev, comedi_rangeinfo *arg) +int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg) { - comedi_rangeinfo it; + struct comedi_rangeinfo it; int subd, chan; const struct comedi_lrange *lr; struct comedi_subdevice *s; - if (copy_from_user(&it, arg, sizeof(comedi_rangeinfo))) + if (copy_from_user(&it, arg, sizeof(struct comedi_rangeinfo))) return -EFAULT; subd = (it.range_type >> 24) & 0xf; chan = (it.range_type >> 16) & 0xff; |