diff options
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/comedi.h | 5 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index a2dc749ef6b9..22a082fd78ee 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -294,7 +294,7 @@ enum comedi_support_level { #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_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_LOCK _IO(CIO, 5) #define COMEDI_UNLOCK _IO(CIO, 6) @@ -310,7 +310,6 @@ enum comedi_support_level { /* structures */ -typedef struct comedi_chaninfo_struct comedi_chaninfo; typedef struct comedi_subdinfo_struct comedi_subdinfo; typedef struct comedi_devinfo_struct comedi_devinfo; typedef struct comedi_devconfig_struct comedi_devconfig; @@ -374,7 +373,7 @@ struct comedi_cmd { unsigned int data_len; }; -struct comedi_chaninfo_struct { +struct comedi_chaninfo { unsigned int subdev; unsigned int *maxdata_list; unsigned int *flaglist; diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index a70d71b8b0f0..1ffaf8c38f13 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -75,7 +75,7 @@ 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, 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_cmd_ioctl(struct comedi_device *dev, void *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 */ -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; - 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; if (it.subdev >= dev->n_subdevices) |