diff options
| author | Bill Pemberton | 2009-03-17 03:06:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-04-03 23:53:58 +0200 |
| commit | 063db04b8901c5cf84c552a5053748d183d34e61 (patch) | |
| tree | b4d0845f02511cff76cd964ea7f2400beee14bce /drivers/staging/comedi/comedi_fops.c | |
| parent | Staging: comedi: Remove comedi_subdinfo typedef (diff) | |
| download | kernel-qcow2-linux-063db04b8901c5cf84c552a5053748d183d34e61.tar.gz kernel-qcow2-linux-063db04b8901c5cf84c552a5053748d183d34e61.tar.xz kernel-qcow2-linux-063db04b8901c5cf84c552a5053748d183d34e61.zip | |
Staging: comedi: Remove comedi_devinfo typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index bc1bc3df9197..2d99a4e33b58 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -71,7 +71,7 @@ static struct comedi_device_file_info 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, +static int do_devinfo_ioctl(struct comedi_device *dev, struct comedi_devinfo *arg, struct file *file); static int do_subdinfo_ioctl(struct comedi_device *dev, struct comedi_subdinfo *arg, void *file); @@ -360,10 +360,10 @@ copyback: devinfo structure */ -static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg, +static int do_devinfo_ioctl(struct comedi_device *dev, struct comedi_devinfo *arg, struct file *file) { - comedi_devinfo devinfo; + struct comedi_devinfo devinfo; const unsigned minor = iminor(file->f_dentry->d_inode); struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); @@ -390,7 +390,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg, else devinfo.write_subdevice = -1; - if (copy_to_user(arg, &devinfo, sizeof(comedi_devinfo))) + if (copy_to_user(arg, &devinfo, sizeof(struct comedi_devinfo))) return -EFAULT; return 0; |