leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: comedi: Remove comedi_chaninfo typedef

Browse Source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2009-03-16 22:06:04 -04:00 committed by Greg Kroah-Hartman
parent da613f4fab
commit a18b416dc1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/comedi/comedi.h
View File

@ -294,7 +294,7 @@ enum comedi_support_level {
#define COMEDI_DEVCONFIG _IOW(CIO, 0, comedi_devconfig) #define COMEDI_DEVCONFIG _IOW(CIO, 0, comedi_devconfig)
#define COMEDI_DEVINFO _IOR(CIO, 1, comedi_devinfo) #define COMEDI_DEVINFO _IOR(CIO, 1, comedi_devinfo)
#define COMEDI_SUBDINFO _IOR(CIO, 2, comedi_subdinfo) #define COMEDI_SUBDINFO _IOR(CIO, 2, comedi_subdinfo)
#define COMEDI_CHANINFO _IOR(CIO, 3, comedi_chaninfo) #define COMEDI_CHANINFO _IOR(CIO, 3, struct comedi_chaninfo)
#define COMEDI_TRIG _IOWR(CIO, 4, comedi_trig) #define COMEDI_TRIG _IOWR(CIO, 4, comedi_trig)
#define COMEDI_LOCK _IO(CIO, 5) #define COMEDI_LOCK _IO(CIO, 5)
#define COMEDI_UNLOCK _IO(CIO, 6) #define COMEDI_UNLOCK _IO(CIO, 6)
@ -310,7 +310,6 @@ enum comedi_support_level {
/* structures */ /* structures */
typedef struct comedi_chaninfo_struct comedi_chaninfo;
typedef struct comedi_subdinfo_struct comedi_subdinfo; typedef struct comedi_subdinfo_struct comedi_subdinfo;
typedef struct comedi_devinfo_struct comedi_devinfo; typedef struct comedi_devinfo_struct comedi_devinfo;
typedef struct comedi_devconfig_struct comedi_devconfig; typedef struct comedi_devconfig_struct comedi_devconfig;
@ -374,7 +373,7 @@ struct comedi_cmd {
unsigned int data_len; unsigned int data_len;
}; };
struct comedi_chaninfo_struct { struct comedi_chaninfo {
unsigned int subdev; unsigned int subdev;
unsigned int *maxdata_list; unsigned int *maxdata_list;
unsigned int *flaglist; unsigned int *flaglist;

8
drivers/staging/comedi/comedi_fops.c
View File

@ -75,7 +75,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg,
struct file *file); struct file *file);
static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg, static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg,
void *file); void *file);
static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg); static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo *arg);
static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg); static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg);
static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file); static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file); static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file);
@ -490,12 +490,12 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg,
arrays at elements of chaninfo structure arrays at elements of chaninfo structure
*/ */
static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg) static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo *arg)
{ {
struct comedi_subdevice *s; struct comedi_subdevice *s;
comedi_chaninfo it; struct comedi_chaninfo it;
if (copy_from_user(&it, arg, sizeof(comedi_chaninfo))) if (copy_from_user(&it, arg, sizeof(struct comedi_chaninfo)))
return -EFAULT; return -EFAULT;
if (it.subdev >= dev->n_subdevices) if (it.subdev >= dev->n_subdevices)