summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/comedi.h
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:05:53 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:57 -0700
commit90035c0886b256d75bced13b3b3cea5234aff136 (patch)
tree8dbe0756731a1e3a771ce9f77c865f572db042e1 /drivers/staging/comedi/comedi.h
parentea6d0d4cab4f4f2d6a88f3bce4707fe92696fd3f (diff)
Staging: comedi: Remove comedi_insn typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedi.h')
-rw-r--r--drivers/staging/comedi/comedi.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 1057c9126b85..3c99179f90ef 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -303,14 +303,13 @@ enum comedi_support_level {
#define COMEDI_CMD _IOR(CIO, 9, struct comedi_cmd)
#define COMEDI_CMDTEST _IOR(CIO, 10, struct comedi_cmd)
#define COMEDI_INSNLIST _IOR(CIO, 11, comedi_insnlist)
-#define COMEDI_INSN _IOR(CIO, 12, comedi_insn)
+#define COMEDI_INSN _IOR(CIO, 12, struct comedi_insn)
#define COMEDI_BUFCONFIG _IOR(CIO, 13, comedi_bufconfig)
#define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo)
#define COMEDI_POLL _IO(CIO, 15)
/* structures */
-typedef struct comedi_insn_struct comedi_insn;
typedef struct comedi_insnlist_struct comedi_insnlist;
typedef struct comedi_chaninfo_struct comedi_chaninfo;
typedef struct comedi_subdinfo_struct comedi_subdinfo;
@@ -336,7 +335,7 @@ struct comedi_trig {
unsigned int unused[3];
};
-struct comedi_insn_struct {
+struct comedi_insn {
unsigned int insn;
unsigned int n;
unsigned int *data;
@@ -347,7 +346,7 @@ struct comedi_insn_struct {
struct comedi_insnlist_struct {
unsigned int n_insns;
- comedi_insn *insns;
+ struct comedi_insn *insns;
};
struct comedi_cmd {