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/ni_at_a2150.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/ni_at_a2150.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_at_a2150.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index bf16e12..4ac5313 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -169,7 +169,7 @@ typedef struct { static int a2150_attach(struct comedi_device * dev, comedi_devconfig * it); static int a2150_detach(struct comedi_device * dev); -static int a2150_cancel(struct comedi_device * dev, comedi_subdevice * s); +static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s); static comedi_driver driver_a2150 = { driver_name:"ni_at_a2150", @@ -179,10 +179,10 @@ static comedi_driver driver_a2150 = { }; static irqreturn_t a2150_interrupt(int irq, void *d PT_REGS_ARG); -static int a2150_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, +static int a2150_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd); -static int a2150_ai_cmd(struct comedi_device * dev, comedi_subdevice * s); -static int a2150_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s, +static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); +static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); static int a2150_get_timing(struct comedi_device * dev, unsigned int *period, int flags); @@ -213,7 +213,7 @@ static irqreturn_t a2150_interrupt(int irq, void *d PT_REGS_ARG) int status; unsigned long flags; struct comedi_device *dev = d; - comedi_subdevice *s = dev->read_subdev; + struct comedi_subdevice *s = dev->read_subdev; comedi_async *async; comedi_cmd *cmd; unsigned int max_points, num_points, residue, leftover; @@ -324,7 +324,7 @@ static int a2150_probe(struct comedi_device * dev) static int a2150_attach(struct comedi_device * dev, comedi_devconfig * it) { - comedi_subdevice *s; + struct comedi_subdevice *s; unsigned long iobase = it->options[0]; unsigned int irq = it->options[1]; unsigned int dma = it->options[2]; @@ -470,7 +470,7 @@ static int a2150_detach(struct comedi_device * dev) return 0; }; -static int a2150_cancel(struct comedi_device * dev, comedi_subdevice * s) +static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s) { // disable dma on card devpriv->irq_dma_bits &= ~DMA_INTR_EN_BIT & ~DMA_EN_BIT; @@ -485,7 +485,7 @@ static int a2150_cancel(struct comedi_device * dev, comedi_subdevice * s) return 0; } -static int a2150_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, +static int a2150_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd) { int err = 0; @@ -615,7 +615,7 @@ static int a2150_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, return 0; } -static int a2150_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) +static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) { comedi_async *async = s->async; comedi_cmd *cmd = &async->cmd; @@ -726,7 +726,7 @@ static int a2150_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) return 0; } -static int a2150_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s, +static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { unsigned int i, n; |