Skip to content

L
linux-davinci
Commit b50d88d0 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: Remove comedi_trig typedef 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0bfbbe8f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
drivers/staging/comedi/comedi.h
View file @ b50d88d0
...@@ -310,7 +310,6 @@ enum comedi_support_level { ...@@ -310,7 +310,6 @@ enum comedi_support_level {
/* structures */ /* structures */
typedef struct comedi_trig_struct comedi_trig;
typedef struct comedi_cmd_struct comedi_cmd; typedef struct comedi_cmd_struct comedi_cmd;
typedef struct comedi_insn_struct comedi_insn; typedef struct comedi_insn_struct comedi_insn;
typedef struct comedi_insnlist_struct comedi_insnlist; typedef struct comedi_insnlist_struct comedi_insnlist;
...@@ -323,7 +322,7 @@ typedef struct comedi_krange_struct comedi_krange; ...@@ -323,7 +322,7 @@ typedef struct comedi_krange_struct comedi_krange;
typedef struct comedi_bufconfig_struct comedi_bufconfig; typedef struct comedi_bufconfig_struct comedi_bufconfig;
typedef struct comedi_bufinfo_struct comedi_bufinfo; typedef struct comedi_bufinfo_struct comedi_bufinfo;
struct comedi_trig_struct { struct comedi_trig {
unsigned int subdev; /* subdevice */ unsigned int subdev; /* subdevice */
unsigned int mode; /* mode */ unsigned int mode; /* mode */
unsigned int flags; unsigned int flags;
......
drivers/staging/comedi/comedilib.h
View file @ b50d88d0
...@@ -62,8 +62,8 @@ int comedi_register_callback(void *dev, unsigned int subdev, ...@@ -62,8 +62,8 @@ int comedi_register_callback(void *dev, unsigned int subdev,
int comedi_command(void *dev, comedi_cmd *cmd); int comedi_command(void *dev, comedi_cmd *cmd);
int comedi_command_test(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, struct 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_data_write(void *dev, unsigned int subdev, unsigned int chan, int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan,
unsigned int range, unsigned int aref, unsigned int data); unsigned int range, unsigned int aref, unsigned int data);
int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan, 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, ...@@ -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(unsigned int minor, comedi_cmd *cmd);
int comedi_command_test(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, struct 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_data_write(unsigned int dev, unsigned int subdev, unsigned int chan, int comedi_data_write(unsigned int dev, unsigned int subdev, unsigned int chan,
unsigned int range, unsigned int aref, unsigned int data); unsigned int range, unsigned int aref, unsigned int data);
int comedi_data_read(unsigned int dev, unsigned int subdev, unsigned int chan, int comedi_data_read(unsigned int dev, unsigned int subdev, unsigned int chan,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment