diff options
Diffstat (limited to 'drivers/staging/comedi/kcomedilib/dio.c')
| -rw-r--r-- | drivers/staging/comedi/kcomedilib/dio.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/kcomedilib/dio.c b/drivers/staging/comedi/kcomedilib/dio.c index a9f488aed369..8595567e48fb 100644 --- a/drivers/staging/comedi/kcomedilib/dio.c +++ b/drivers/staging/comedi/kcomedilib/dio.c @@ -26,10 +26,10 @@ #include <linux/string.h> -int comedi_dio_config(comedi_t * dev, unsigned int subdev, unsigned int chan, +int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, unsigned int io) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_CONFIG; @@ -41,10 +41,10 @@ int comedi_dio_config(comedi_t * dev, unsigned int subdev, unsigned int chan, return comedi_do_insn(dev, &insn); } -int comedi_dio_read(comedi_t * dev, unsigned int subdev, unsigned int chan, +int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, unsigned int *val) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_READ; @@ -56,10 +56,10 @@ int comedi_dio_read(comedi_t * dev, unsigned int subdev, unsigned int chan, return comedi_do_insn(dev, &insn); } -int comedi_dio_write(comedi_t * dev, unsigned int subdev, unsigned int chan, +int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, unsigned int val) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_WRITE; @@ -71,11 +71,11 @@ int comedi_dio_write(comedi_t * dev, unsigned int subdev, unsigned int chan, return comedi_do_insn(dev, &insn); } -int comedi_dio_bitfield(comedi_t * dev, unsigned int subdev, unsigned int mask, +int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, unsigned int *bits) { - comedi_insn insn; - lsampl_t data[2]; + struct comedi_insn insn; + unsigned int data[2]; int ret; memset(&insn, 0, sizeof(insn)); |