diff options
author | 2009-03-16 22:05:14 -0400 | |
---|---|---|
committer | 2009-04-03 14:53:56 -0700 | |
commit | 34c43922e62708d45e9660eee4b4f1fb7b4bf2c7 (patch) | |
tree | 9d49b7a121b9e07f2ff24e28c45bfc052c63b324 /drivers/staging/comedi/drivers/ni_atmio16d.c | |
parent | Staging: comedi: Remove comedi_device typedef (diff) | |
download | linux-dev-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.tar.xz linux-dev-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.zip |
Staging: comedi: Remove comedi_subdevice typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_atmio16d.c')
-rw-r--r-- | drivers/staging/comedi/drivers/ni_atmio16d.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c index 62be3d9ec484..9c59c51863fe 100644 --- a/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c @@ -126,10 +126,10 @@ static const atmio16_board_t atmio16_boards[] = { static int atmio16d_attach(struct comedi_device * dev, comedi_devconfig * it); static int atmio16d_detach(struct comedi_device * dev); static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG); -static int atmio16d_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd); -static int atmio16d_ai_cmd(struct comedi_device * dev, comedi_subdevice * s); -static int atmio16d_ai_cancel(struct comedi_device * dev, comedi_subdevice * s); +static int atmio16d_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); +static int atmio16d_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); static void reset_counters(struct comedi_device * dev); static void reset_atmio16d(struct comedi_device * dev); @@ -258,7 +258,7 @@ static void reset_atmio16d(struct comedi_device * dev) static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG) { struct comedi_device *dev = d; - comedi_subdevice *s = dev->subdevices + 0; + struct comedi_subdevice *s = dev->subdevices + 0; // printk("atmio16d_interrupt!\n"); @@ -268,7 +268,7 @@ static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG) return IRQ_HANDLED; } -static int atmio16d_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd) { int err = 0, tmp; @@ -369,7 +369,7 @@ static int atmio16d_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, return 0; } -static int atmio16d_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) +static int atmio16d_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) { comedi_cmd *cmd = &s->async->cmd; unsigned int timer, base_clock; @@ -517,7 +517,7 @@ static int atmio16d_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) } /* This will cancel a running acquisition operation */ -static int atmio16d_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) +static int atmio16d_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) { reset_atmio16d(dev); @@ -525,7 +525,7 @@ static int atmio16d_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) } /* Mode 0 is used to get a single conversion on demand */ -static int atmio16d_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i, t; @@ -584,7 +584,7 @@ static int atmio16d_ai_insn_read(struct comedi_device * dev, comedi_subdevice * return i; } -static int atmio16d_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i; @@ -599,7 +599,7 @@ static int atmio16d_ao_insn_read(struct comedi_device * dev, comedi_subdevice * return i; } -static int atmio16d_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i; @@ -634,7 +634,7 @@ static int atmio16d_ao_insn_write(struct comedi_device * dev, comedi_subdevice * return i; } -static int atmio16d_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (insn->n != 2) @@ -650,7 +650,7 @@ static int atmio16d_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * return 2; } -static int atmio16d_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s, +static int atmio16d_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i; @@ -710,7 +710,7 @@ static int atmio16d_attach(struct comedi_device * dev, comedi_devconfig * it) unsigned long iobase; int ret; - comedi_subdevice *s; + struct comedi_subdevice *s; /* make sure the address range is free and allocate it */ iobase = it->options[0]; |