From wfp5p@virginia.edu Mon Mar 16 17:21:01 2009 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:06:15 -0400 Subject: Staging: comedi: Remove comedi_devinfo typedef To: greg@kroah.com Message-ID: <20090317020615.14467.23373.stgit@viridian.itc.Virginia.EDU> Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi.h | 5 ++--- drivers/staging/comedi/comedi_fops.c | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) --- 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 comed 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; --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -292,7 +292,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_DEVINFO _IOR(CIO, 1, struct comedi_devinfo) #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) @@ -310,7 +310,6 @@ enum comedi_support_level { /* structures */ -typedef struct comedi_devinfo_struct comedi_devinfo; typedef struct comedi_devconfig_struct comedi_devconfig; typedef struct comedi_rangeinfo_struct comedi_rangeinfo; typedef struct comedi_krange_struct comedi_krange; @@ -406,7 +405,7 @@ struct comedi_subdinfo { unsigned int unused[8]; }; -struct comedi_devinfo_struct { +struct comedi_devinfo { unsigned int version_code; unsigned int n_subdevs; char driver_name[COMEDI_NAMELEN];