diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/comedi_parport.c')
-rw-r--r-- | drivers/staging/comedi/drivers/comedi_parport.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c index b432d50df4d..50790b651ce 100644 --- a/drivers/staging/comedi/drivers/comedi_parport.c +++ b/drivers/staging/comedi/drivers/comedi_parport.c @@ -108,7 +108,7 @@ struct parport_private { }; #define devpriv ((struct parport_private *)(dev->private)) -static int parport_insn_a(struct comedi_device *dev, comedi_subdevice *s, +static int parport_insn_a(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { if (data[0]) { @@ -123,7 +123,7 @@ static int parport_insn_a(struct comedi_device *dev, comedi_subdevice *s, return 2; } -static int parport_insn_config_a(struct comedi_device *dev, comedi_subdevice *s, +static int parport_insn_config_a(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { if (data[0]) { @@ -138,7 +138,7 @@ static int parport_insn_config_a(struct comedi_device *dev, comedi_subdevice *s, return 1; } -static int parport_insn_b(struct comedi_device *dev, comedi_subdevice *s, +static int parport_insn_b(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { if (data[0]) { @@ -151,7 +151,7 @@ static int parport_insn_b(struct comedi_device *dev, comedi_subdevice *s, return 2; } -static int parport_insn_c(struct comedi_device *dev, comedi_subdevice *s, +static int parport_insn_c(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { data[0] &= 0x0f; @@ -167,7 +167,7 @@ static int parport_insn_c(struct comedi_device *dev, comedi_subdevice *s, return 2; } -static int parport_intr_insn(struct comedi_device *dev, comedi_subdevice *s, +static int parport_intr_insn(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { if (insn->n < 1) @@ -177,7 +177,7 @@ static int parport_intr_insn(struct comedi_device *dev, comedi_subdevice *s, return 2; } -static int parport_intr_cmdtest(struct comedi_device *dev, comedi_subdevice *s, +static int parport_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, comedi_cmd *cmd) { int err = 0; @@ -252,7 +252,7 @@ static int parport_intr_cmdtest(struct comedi_device *dev, comedi_subdevice *s, return 0; } -static int parport_intr_cmd(struct comedi_device *dev, comedi_subdevice *s) +static int parport_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s) { devpriv->c_data |= 0x10; outb(devpriv->c_data, dev->iobase + PARPORT_C); @@ -262,7 +262,7 @@ static int parport_intr_cmd(struct comedi_device *dev, comedi_subdevice *s) return 0; } -static int parport_intr_cancel(struct comedi_device *dev, comedi_subdevice *s) +static int parport_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s) { printk(KERN_DEBUG "parport_intr_cancel()\n"); @@ -277,7 +277,7 @@ static int parport_intr_cancel(struct comedi_device *dev, comedi_subdevice *s) static irqreturn_t parport_interrupt(int irq, void *d PT_REGS_ARG) { struct comedi_device *dev = d; - comedi_subdevice *s = dev->subdevices + 3; + struct comedi_subdevice *s = dev->subdevices + 3; if (!devpriv->enable_irq) { printk(KERN_ERR "comedi_parport: bogus irq, ignored\n"); @@ -296,7 +296,7 @@ static int parport_attach(struct comedi_device *dev, comedi_devconfig *it) int ret; unsigned int irq; unsigned long iobase; - comedi_subdevice *s; + struct comedi_subdevice *s; iobase = it->options[0]; printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase); |