diff options
| author | Bill Pemberton | 2009-03-17 03:06:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-04-03 23:53:57 +0200 |
| commit | bd52efbbcc9f5d70c736b9b73c82aee149da1fe5 (patch) | |
| tree | 1023df5443e51f699c91c498da01c63f2fb0004b /drivers/staging/comedi | |
| parent | Staging: comedi: Remove comedi_chaninfo typedef (diff) | |
| download | kernel-qcow2-linux-bd52efbbcc9f5d70c736b9b73c82aee149da1fe5.tar.gz kernel-qcow2-linux-bd52efbbcc9f5d70c736b9b73c82aee149da1fe5.tar.xz kernel-qcow2-linux-bd52efbbcc9f5d70c736b9b73c82aee149da1fe5.zip | |
Staging: comedi: Remove comedi_subdinfo 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_fops.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 22a082fd78ee..d2293d287516 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -293,7 +293,7 @@ enum comedi_support_level { #define CIO 'd' #define COMEDI_DEVCONFIG _IOW(CIO, 0, comedi_devconfig) #define COMEDI_DEVINFO _IOR(CIO, 1, comedi_devinfo) -#define COMEDI_SUBDINFO _IOR(CIO, 2, comedi_subdinfo) +#define COMEDI_SUBDINFO _IOR(CIO, 2, struct comedi_subdinfo) #define COMEDI_CHANINFO _IOR(CIO, 3, struct comedi_chaninfo) #define COMEDI_TRIG _IOWR(CIO, 4, comedi_trig) #define COMEDI_LOCK _IO(CIO, 5) @@ -310,7 +310,6 @@ enum comedi_support_level { /* structures */ -typedef struct comedi_subdinfo_struct comedi_subdinfo; typedef struct comedi_devinfo_struct comedi_devinfo; typedef struct comedi_devconfig_struct comedi_devconfig; typedef struct comedi_rangeinfo_struct comedi_rangeinfo; @@ -393,7 +392,7 @@ struct comedi_krange_struct { }; -struct comedi_subdinfo_struct { +struct comedi_subdinfo { unsigned int type; unsigned int n_chan; unsigned int subd_flags; diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 1ffaf8c38f13..bc1bc3df9197 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -73,7 +73,7 @@ static int do_devconfig_ioctl(struct comedi_device *dev, comedi_devconfig *arg); static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg); static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg, struct file *file); -static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg, +static int do_subdinfo_ioctl(struct comedi_device *dev, struct comedi_subdinfo *arg, void *file); static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo *arg); static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg); @@ -410,14 +410,14 @@ static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg, array of subdevice info structures at arg */ -static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg, +static int do_subdinfo_ioctl(struct comedi_device *dev, struct comedi_subdinfo *arg, void *file) { int ret, i; - comedi_subdinfo *tmp, *us; + struct comedi_subdinfo *tmp, *us; struct comedi_subdevice *s; - tmp = kcalloc(dev->n_subdevices, sizeof(comedi_subdinfo), GFP_KERNEL); + tmp = kcalloc(dev->n_subdevices, sizeof(struct comedi_subdinfo), GFP_KERNEL); if (!tmp) return -ENOMEM; @@ -469,7 +469,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg, } ret = copy_to_user(arg, tmp, - dev->n_subdevices * sizeof(comedi_subdinfo)); + dev->n_subdevices * sizeof(struct comedi_subdinfo)); kfree(tmp); |