diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-17 02:05:02 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 21:53:55 (GMT) |
commit | 790c55415aa31f4c732729f94d2c3a54f7d3bfc2 (patch) | |
tree | b99f2742dbaa8f43cc97df979ca507b602b3f7cd /drivers/staging/comedi/kcomedilib | |
parent | 0b3fb27fa7b4bf811c31ee66453cda0a6d94aa6c (diff) | |
download | linux-fsl-qoriq-790c55415aa31f4c732729f94d2c3a54f7d3bfc2.tar.xz |
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/kcomedilib')
-rw-r--r-- | drivers/staging/comedi/kcomedilib/data.c | 8 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/dio.c | 2 | ||||
-rw-r--r-- | drivers/staging/comedi/kcomedilib/get.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/kcomedilib/data.c b/drivers/staging/comedi/kcomedilib/data.c index f63a506..53f2047 100644 --- a/drivers/staging/comedi/kcomedilib/data.c +++ b/drivers/staging/comedi/kcomedilib/data.c @@ -28,7 +28,7 @@ #include <linux/string.h> int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan, - unsigned int range, unsigned int aref, lsampl_t data) + unsigned int range, unsigned int aref, unsigned int data) { comedi_insn insn; @@ -43,7 +43,7 @@ int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan, } int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan, - unsigned int range, unsigned int aref, lsampl_t *data) + unsigned int range, unsigned int aref, unsigned int *data) { comedi_insn insn; @@ -61,7 +61,7 @@ int comedi_data_read_hint(void *dev, unsigned int subdev, unsigned int chan, unsigned int range, unsigned int aref) { comedi_insn insn; - lsampl_t dummy_data; + unsigned int dummy_data; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_READ; @@ -75,7 +75,7 @@ int comedi_data_read_hint(void *dev, unsigned int subdev, int comedi_data_read_delayed(void *dev, unsigned int subdev, unsigned int chan, unsigned int range, unsigned int aref, - lsampl_t *data, unsigned int nano_sec) + unsigned int *data, unsigned int nano_sec) { int retval; diff --git a/drivers/staging/comedi/kcomedilib/dio.c b/drivers/staging/comedi/kcomedilib/dio.c index 78e63c8..1a76ef5 100644 --- a/drivers/staging/comedi/kcomedilib/dio.c +++ b/drivers/staging/comedi/kcomedilib/dio.c @@ -75,7 +75,7 @@ int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, unsigned int *bits) { comedi_insn insn; - lsampl_t data[2]; + unsigned int data[2]; int ret; memset(&insn, 0, sizeof(insn)); diff --git a/drivers/staging/comedi/kcomedilib/get.c b/drivers/staging/comedi/kcomedilib/get.c index 5a69d8c..4bb3259 100644 --- a/drivers/staging/comedi/kcomedilib/get.c +++ b/drivers/staging/comedi/kcomedilib/get.c @@ -98,7 +98,7 @@ int comedi_get_len_chanlist(void *d, unsigned int subdevice) return s->len_chanlist; } -lsampl_t comedi_get_maxdata(void *d, unsigned int subdevice, +unsigned int comedi_get_maxdata(void *d, unsigned int subdevice, unsigned int chan) { comedi_device *dev = (comedi_device *) d; |