From 790c55415aa31f4c732729f94d2c3a54f7d3bfc2 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:05:02 -0400 Subject: Staging: comedi: Remove lsampl_t and sampl_t typedefs Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/kcomedilib/data.c | 8 ++++---- drivers/staging/comedi/kcomedilib/dio.c | 2 +- drivers/staging/comedi/kcomedilib/get.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging/comedi/kcomedilib') diff --git a/drivers/staging/comedi/kcomedilib/data.c b/drivers/staging/comedi/kcomedilib/data.c index f63a506dd8a..53f20476e99 100644 --- a/drivers/staging/comedi/kcomedilib/data.c +++ b/drivers/staging/comedi/kcomedilib/data.c @@ -28,7 +28,7 @@ #include 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 78e63c84072..1a76ef57537 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 5a69d8cf156..4bb32593a79 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; -- cgit v1.2.3