Staging: comedi: Remove comedi_insn typedef

[deliverable/linux.git] / drivers / staging / comedi / kcomedilib / data.c

diff --git a/drivers/staging/comedi/kcomedilib/data.c b/drivers/staging/comedi/kcomedilib/data.c
index f63a506dd8ab37bcd86937895f2e2a509123868c..9797e13e377470a9047da6f41a58062a61ca15e2 100644 (file)
--- a/drivers/staging/comedi/kcomedilib/data.c
+++ b/drivers/staging/comedi/kcomedilib/data.c
@@ -28,9 +28,9 @@
 #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;
+       struct comedi_insn insn;
 
        memset(&insn, 0, sizeof(insn));
        insn.insn = INSN_WRITE;
@@ -43,9 +43,9 @@ 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;
+       struct comedi_insn insn;
 
        memset(&insn, 0, sizeof(insn));
        insn.insn = INSN_READ;
@@ -60,8 +60,8 @@ int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan,
 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;
+       struct comedi_insn insn;
+       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;