diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:02 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:55 -0700 |
| commit | 790c55415aa31f4c732729f94d2c3a54f7d3bfc2 (patch) | |
| tree | b99f2742dbaa8f43cc97df979ca507b602b3f7cd /drivers/staging/comedi/comedi.h | |
| parent | 0b3fb27fa7b4bf811c31ee66453cda0a6d94aa6c (diff) | |
| download | kernel_samsung_smdk4412-790c55415aa31f4c732729f94d2c3a54f7d3bfc2.zip kernel_samsung_smdk4412-790c55415aa31f4c732729f94d2c3a54f7d3bfc2.tar.gz kernel_samsung_smdk4412-790c55415aa31f4c732729f94d2c3a54f7d3bfc2.tar.bz2 | |
Staging: comedi: Remove lsampl_t and sampl_t typedefs
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.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 14b376c..665dbc7 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -57,9 +57,6 @@ extern "C" { /* max length of device and driver names */ #define COMEDI_NAMELEN 20 - typedef unsigned int lsampl_t; - typedef unsigned short sampl_t; - /* packs and unpacks a channel/range number */ #define CR_PACK(chan, rng, aref) ((((aref)&0x3)<<24) | (((rng)&0xff)<<16) | (chan)) @@ -332,7 +329,7 @@ struct comedi_trig_struct { unsigned int flags; unsigned int n_chan; /* number of channels */ unsigned int *chanlist; /* channel/range list */ - sampl_t *data; /* data list, size depends on subd flags */ + short *data; /* data list, size depends on subd flags */ unsigned int n; /* number of scans */ unsigned int trigsrc; unsigned int trigvar; @@ -344,7 +341,7 @@ struct comedi_trig_struct { struct comedi_insn_struct { unsigned int insn; unsigned int n; - lsampl_t *data; + unsigned int *data; unsigned int subdev; unsigned int chanspec; unsigned int unused[3]; @@ -377,13 +374,13 @@ struct comedi_cmd_struct { unsigned int *chanlist; /* channel/range list */ unsigned int chanlist_len; - sampl_t *data; /* data list, size depends on subd flags */ + short *data; /* data list, size depends on subd flags */ unsigned int data_len; }; struct comedi_chaninfo_struct { unsigned int subdev; - lsampl_t *maxdata_list; + unsigned int *maxdata_list; unsigned int *flaglist; unsigned int *rangelist; unsigned int unused[4]; @@ -407,7 +404,7 @@ struct comedi_subdinfo_struct { unsigned int subd_flags; unsigned int timer_type; unsigned int len_chanlist; - lsampl_t maxdata; + unsigned int maxdata; unsigned int flags; /* channel flags */ unsigned int range_type; /* lookup in kernel */ unsigned int settling_time_0; |