diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:56 -0700 |
commit | 34c43922e62708d45e9660eee4b4f1fb7b4bf2c7 (patch) | |
tree | 9d49b7a121b9e07f2ff24e28c45bfc052c63b324 /drivers/staging/comedi/drivers/pcl812.c | |
parent | 71b5f4f11971dea972832ad63a994c7e5b45db6b (diff) | |
download | kernel_samsung_smdk4412-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.zip kernel_samsung_smdk4412-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.tar.gz kernel_samsung_smdk4412-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.tar.bz2 |
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/pcl812.c')
-rw-r--r-- | drivers/staging/comedi/drivers/pcl812.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index 0c8e03d..b678dd6 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c @@ -427,13 +427,13 @@ typedef struct { */ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, unsigned int divisor2); -static void setup_range_channel(struct comedi_device * dev, comedi_subdevice * s, +static void setup_range_channel(struct comedi_device * dev, struct comedi_subdevice * s, unsigned int rangechan, char wait); -static int pcl812_ai_cancel(struct comedi_device * dev, comedi_subdevice * s); +static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); /* ============================================================================== */ -static int pcl812_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s, +static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n; @@ -467,7 +467,7 @@ static int pcl812_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s, /* ============================================================================== */ -static int acl8216_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s, +static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n; @@ -503,7 +503,7 @@ static int acl8216_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s /* ============================================================================== */ -static int pcl812_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s, +static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); @@ -523,7 +523,7 @@ static int pcl812_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s /* ============================================================================== */ -static int pcl812_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s, +static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); @@ -539,7 +539,7 @@ static int pcl812_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s, /* ============================================================================== */ -static int pcl812_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s, +static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (insn->n != 2) @@ -554,7 +554,7 @@ static int pcl812_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s, /* ============================================================================== */ -static int pcl812_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s, +static int pcl812_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (insn->n != 2) @@ -591,7 +591,7 @@ static void pcl812_cmdtest_out(int e, comedi_cmd * cmd) /* ============================================================================== */ -static int pcl812_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, +static int pcl812_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd) { int err = 0; @@ -770,7 +770,7 @@ static int pcl812_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, /* ============================================================================== */ -static int pcl812_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) +static int pcl812_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) { unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes; comedi_cmd *cmd = &s->async->cmd; @@ -923,7 +923,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d) char err = 1; unsigned int mask, timeout; struct comedi_device *dev = d; - comedi_subdevice *s = dev->subdevices + 0; + struct comedi_subdevice *s = dev->subdevices + 0; s->async->events = 0; @@ -980,7 +980,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d) /* ============================================================================== */ -static void transfer_from_dma_buf(struct comedi_device * dev, comedi_subdevice * s, +static void transfer_from_dma_buf(struct comedi_device * dev, struct comedi_subdevice * s, short * ptr, unsigned int bufptr, unsigned int len) { unsigned int i; @@ -1009,7 +1009,7 @@ static void transfer_from_dma_buf(struct comedi_device * dev, comedi_subdevice * static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d) { struct comedi_device *dev = d; - comedi_subdevice *s = dev->subdevices + 0; + struct comedi_subdevice *s = dev->subdevices + 0; unsigned long dma_flags; int len, bufptr; short *ptr; @@ -1075,7 +1075,7 @@ static irqreturn_t interrupt_pcl812(int irq, void *d PT_REGS_ARG) /* ============================================================================== */ -static int pcl812_ai_poll(struct comedi_device * dev, comedi_subdevice * s) +static int pcl812_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) { unsigned long flags; unsigned int top1, top2, i; @@ -1119,7 +1119,7 @@ static int pcl812_ai_poll(struct comedi_device * dev, comedi_subdevice * s) /* ============================================================================== */ -static void setup_range_channel(struct comedi_device * dev, comedi_subdevice * s, +static void setup_range_channel(struct comedi_device * dev, struct comedi_subdevice * s, unsigned int rangechan, char wait) { unsigned char chan_reg = CR_CHAN(rangechan); // normal board @@ -1200,7 +1200,7 @@ static void free_resources(struct comedi_device * dev) /* ============================================================================== */ -static int pcl812_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) +static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) { #ifdef PCL812_EXTDEBUG rt_printk("pcl812 EDBG: BGN: pcl812_ai_cancel(...)\n"); @@ -1269,7 +1269,7 @@ static int pcl812_attach(struct comedi_device * dev, comedi_devconfig * it) unsigned int irq; unsigned int dma; unsigned long pages; - comedi_subdevice *s; + struct comedi_subdevice *s; int n_subdevices; iobase = it->options[0]; |