hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Staging: comedi: Remove comedi_bufinfo typedef 

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:42 -04:00 committed by Greg Kroah-Hartman
parent be6aba4a42
commit 9aa5339ac1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,13 +305,11 @@ enum comedi_support_level {
#define COMEDI_INSNLIST _IOR(CIO, 11, struct comedi_insnlist) #define COMEDI_INSNLIST _IOR(CIO, 11, struct comedi_insnlist)
#define COMEDI_INSN _IOR(CIO, 12, struct comedi_insn) #define COMEDI_INSN _IOR(CIO, 12, struct comedi_insn)
#define COMEDI_BUFCONFIG _IOR(CIO, 13, struct comedi_bufconfig) #define COMEDI_BUFCONFIG _IOR(CIO, 13, struct comedi_bufconfig)
#define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo) #define COMEDI_BUFINFO _IOWR(CIO, 14, struct comedi_bufinfo)
#define COMEDI_POLL _IO(CIO, 15) #define COMEDI_POLL _IO(CIO, 15)
/* structures */ /* structures */
typedef struct comedi_bufinfo_struct comedi_bufinfo;
struct comedi_trig { struct comedi_trig {
unsigned int subdev; /* subdevice */ unsigned int subdev; /* subdevice */
unsigned int mode; /* mode */ unsigned int mode; /* mode */
@ -426,7 +424,7 @@ struct comedi_bufconfig {
unsigned int unused[4]; unsigned int unused[4];
}; };
struct comedi_bufinfo_struct { struct comedi_bufinfo {
unsigned int subdevice; unsigned int subdevice;
unsigned int bytes_read; unsigned int bytes_read;

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

@ -556,11 +556,11 @@ static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo *
*/ */
static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg) static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg)
{ {
comedi_bufinfo bi; struct comedi_bufinfo bi;
struct comedi_subdevice *s; struct comedi_subdevice *s;
struct comedi_async *async; struct comedi_async *async;
if (copy_from_user(&bi, arg, sizeof(comedi_bufinfo))) if (copy_from_user(&bi, arg, sizeof(struct comedi_bufinfo)))
return -EFAULT; return -EFAULT;
if (bi.subdevice >= dev->n_subdevices || bi.subdevice < 0) if (bi.subdevice >= dev->n_subdevices || bi.subdevice < 0)
@ -601,7 +601,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg)
bi.buf_read_ptr = async->buf_read_ptr; bi.buf_read_ptr = async->buf_read_ptr;
copyback: copyback:
if (copy_to_user(arg, &bi, sizeof(comedi_bufinfo))) if (copy_to_user(arg, &bi, sizeof(struct comedi_bufinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;