From: Bill Pemberton <wfp5p@virginia.edu>
Date: Tue, 17 Mar 2009 02:05:42 +0000 (-0400)
Subject: Staging: comedi: Remove comedi_trig typedef
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b50d88d08069ba14d9ba7ba6a15414fdbd077508;p=mv-sheeva.git

Staging: comedi: Remove comedi_trig 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 665dbc7de00..ab9bd016a56 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -310,7 +310,6 @@ enum comedi_support_level {
 
 /* structures */
 
-typedef struct comedi_trig_struct comedi_trig;
 typedef struct comedi_cmd_struct comedi_cmd;
 typedef struct comedi_insn_struct comedi_insn;
 typedef struct comedi_insnlist_struct comedi_insnlist;
@@ -323,7 +322,7 @@ typedef struct comedi_krange_struct comedi_krange;
 typedef struct comedi_bufconfig_struct comedi_bufconfig;
 typedef struct comedi_bufinfo_struct comedi_bufinfo;
 
-struct comedi_trig_struct {
+struct comedi_trig {
 	unsigned int subdev;	/* subdevice */
 	unsigned int mode;	/* mode */
 	unsigned int flags;
diff --git a/drivers/staging/comedi/comedilib.h b/drivers/staging/comedi/comedilib.h
index b4192e486aa..52349774021 100644
--- a/drivers/staging/comedi/comedilib.h
+++ b/drivers/staging/comedi/comedilib.h
@@ -62,8 +62,8 @@ int comedi_register_callback(void *dev, unsigned int subdev,
 
 int comedi_command(void *dev, comedi_cmd *cmd);
 int comedi_command_test(void *dev, comedi_cmd *cmd);
-int comedi_trigger(void *dev, unsigned int subdev, comedi_trig *it);
-int __comedi_trigger(void *dev, unsigned int subdev, comedi_trig *it);
+int comedi_trigger(void *dev, unsigned int subdev, struct comedi_trig *it);
+int __comedi_trigger(void *dev, unsigned int subdev, struct comedi_trig *it);
 int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan,
 	unsigned int range, unsigned int aref, unsigned int data);
 int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan,
@@ -139,8 +139,8 @@ int comedi_register_callback(unsigned int minor, unsigned int subdev,
 
 int comedi_command(unsigned int minor, comedi_cmd *cmd);
 int comedi_command_test(unsigned int minor, comedi_cmd *cmd);
-int comedi_trigger(unsigned int minor, unsigned int subdev, comedi_trig *it);
-int __comedi_trigger(unsigned int minor, unsigned int subdev, comedi_trig *it);
+int comedi_trigger(unsigned int minor, unsigned int subdev, struct comedi_trig *it);
+int __comedi_trigger(unsigned int minor, unsigned int subdev, struct comedi_trig *it);
 int comedi_data_write(unsigned int dev, unsigned int subdev, unsigned int chan,
 	unsigned int range, unsigned int aref, unsigned int data);
 int comedi_data_read(unsigned int dev, unsigned int subdev, unsigned int chan,