diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:57 -0700 |
| commit | b50d88d08069ba14d9ba7ba6a15414fdbd077508 (patch) | |
| tree | 0b7f5c8ddbbc17d1d2c21f1b8f14561fce11f6f6 | |
| parent | 0bfbbe8f09617247c87d3b626cbf007c423afff1 (diff) | |
Staging: comedi: Remove comedi_trig typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/comedi.h | 3 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedilib.h | 8 |
2 files changed, 5 insertions, 6 deletions
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, |