Staging: comedi: Remove comedi_bufconfig typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 079cb6e..17c0149 100644 (file)
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -304,13 +304,12 @@ enum comedi_support_level {
 #define COMEDI_CMDTEST _IOR(CIO, 10, struct comedi_cmd)
 #define COMEDI_INSNLIST _IOR(CIO, 11, struct comedi_insnlist)
 #define COMEDI_INSN _IOR(CIO, 12, struct comedi_insn)
-#define COMEDI_BUFCONFIG _IOR(CIO, 13, comedi_bufconfig)
+#define COMEDI_BUFCONFIG _IOR(CIO, 13, struct comedi_bufconfig)
 #define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo)
 #define COMEDI_POLL _IO(CIO, 15)
 
 /* structures */
 
-typedef struct comedi_bufconfig_struct comedi_bufconfig;
 typedef struct comedi_bufinfo_struct comedi_bufinfo;
 
 struct comedi_trig {
@@ -417,7 +416,7 @@ struct comedi_devconfig {
        int options[COMEDI_NDEVCONFOPTS];
 };
 
-struct comedi_bufconfig_struct {
+struct comedi_bufconfig {
        unsigned int subdevice;
        unsigned int flags;
 

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 0e9ad62..5cb6031 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -274,12 +274,12 @@ static int do_devconfig_ioctl(struct comedi_device *dev, struct comedi_devconfig
 */
 static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg)
 {
-       comedi_bufconfig bc;
+       struct comedi_bufconfig bc;
        struct comedi_async *async;
        struct comedi_subdevice *s;
        int ret = 0;
 
-       if (copy_from_user(&bc, arg, sizeof(comedi_bufconfig)))
+       if (copy_from_user(&bc, arg, sizeof(struct comedi_bufconfig)))
                return -EFAULT;
 
        if (bc.subdevice >= dev->n_subdevices || bc.subdevice < 0)
@@ -340,7 +340,7 @@ static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg)
        bc.maximum_size = async->max_bufsize;
 
 copyback:
-       if (copy_to_user(arg, &bc, sizeof(comedi_bufconfig)))
+       if (copy_to_user(arg, &bc, sizeof(struct comedi_bufconfig)))
                return -EFAULT;
 
        return 0;