diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/rtd520.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index f4b1fc6fa48..405c2040a88 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -690,21 +690,21 @@ static comedi_driver rtd520Driver = { detach : rtd_detach, }; -static int rtd_ai_rinsn(struct comedi_device *dev, comedi_subdevice *s, +static int rtd_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int rtd_ao_winsn(struct comedi_device *dev, comedi_subdevice *s, +static int rtd_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int rtd_ao_rinsn(struct comedi_device *dev, comedi_subdevice *s, +static int rtd_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int rtd_dio_insn_bits(struct comedi_device *dev, comedi_subdevice *s, +static int rtd_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int rtd_dio_insn_config(struct comedi_device *dev, comedi_subdevice *s, +static int rtd_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int rtd_ai_cmdtest(struct comedi_device *dev, comedi_subdevice *s, +static int rtd_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, comedi_cmd *cmd); -static int rtd_ai_cmd(struct comedi_device *dev, comedi_subdevice *s); -static int rtd_ai_cancel(struct comedi_device *dev, comedi_subdevice *s); -/* static int rtd_ai_poll (struct comedi_device *dev,comedi_subdevice *s); */ +static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s); +static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); +/* static int rtd_ai_poll (struct comedi_device *dev,struct comedi_subdevice *s); */ static int rtd_ns_to_timer(unsigned int *ns, int roundMode); static irqreturn_t rtd_interrupt(int irq, void *d PT_REGS_ARG); static int rtd520_probe_fifo_depth(struct comedi_device *dev); @@ -717,7 +717,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev); */ static int rtd_attach(struct comedi_device *dev, comedi_devconfig *it) { /* board name and options flags */ - comedi_subdevice *s; + struct comedi_subdevice *s; struct pci_dev *pcidev; int ret; resource_size_t physLas0; /* configuation */ @@ -1255,7 +1255,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev) select, delay, then read. */ static int rtd_ai_rinsn(struct comedi_device *dev, - comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int n, ii; int stat; @@ -1307,7 +1307,7 @@ static int rtd_ai_rinsn(struct comedi_device *dev, The manual claims that we can do a lword read, but it doesn't work here. */ -static int ai_read_n(struct comedi_device *dev, comedi_subdevice *s, int count) +static int ai_read_n(struct comedi_device *dev, struct comedi_subdevice *s, int count) { int ii; @@ -1346,7 +1346,7 @@ static int ai_read_n(struct comedi_device *dev, comedi_subdevice *s, int count) /* unknown amout of data is waiting in fifo. */ -static int ai_read_dregs(struct comedi_device *dev, comedi_subdevice *s) +static int ai_read_dregs(struct comedi_device *dev, struct comedi_subdevice *s) { while (RtdFifoStatus(dev) & FS_ADC_NOT_EMPTY) { /* 1 -> not empty */ short sample; @@ -1434,7 +1434,7 @@ void abort_dma(struct comedi_device *dev, unsigned int channel) Process what is in the DMA transfer buffer and pass to comedi Note: this is not re-entrant */ -static int ai_process_dma(struct comedi_device *dev, comedi_subdevice *s) +static int ai_process_dma(struct comedi_device *dev, struct comedi_subdevice *s) { int ii, n; s16 *dp; @@ -1500,7 +1500,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ struct comedi_device *dev = d; /* must be called "dev" for devpriv */ u16 status; u16 fifoStatus; - comedi_subdevice *s = dev->subdevices + 0; /* analog in subdevice */ + struct comedi_subdevice *s = dev->subdevices + 0; /* analog in subdevice */ if (!dev->attached) { return IRQ_NONE; @@ -1648,7 +1648,7 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */ /* return the number of samples available */ -static int rtd_ai_poll(struct comedi_device *dev, comedi_subdevice *s) +static int rtd_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) { /* TODO: This needs to mask interrupts, read_dregs, and then re-enable */ /* Not sure what to do if DMA is active */ @@ -1666,7 +1666,7 @@ static int rtd_ai_poll(struct comedi_device *dev, comedi_subdevice *s) */ static int rtd_ai_cmdtest(struct comedi_device *dev, - comedi_subdevice *s, comedi_cmd *cmd) + struct comedi_subdevice *s, comedi_cmd *cmd) { int err = 0; int tmp; @@ -1870,7 +1870,7 @@ static int rtd_ai_cmdtest(struct comedi_device *dev, This is usually done by an interrupt handler. Userland gets to the data using read calls. */ -static int rtd_ai_cmd(struct comedi_device *dev, comedi_subdevice *s) +static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) { comedi_cmd *cmd = &s->async->cmd; int timer; @@ -2067,7 +2067,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, comedi_subdevice *s) /* Stop a running data aquisition. */ -static int rtd_ai_cancel(struct comedi_device *dev, comedi_subdevice *s) +static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) { u16 status; @@ -2136,7 +2136,7 @@ static int rtd_ns_to_timer(unsigned int *ns, int round_mode) Output one (or more) analog values to a single port as fast as possible. */ static int rtd_ao_winsn(struct comedi_device *dev, - comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -2191,7 +2191,7 @@ static int rtd_ao_winsn(struct comedi_device *dev, /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int rtd_ao_rinsn(struct comedi_device *dev, - comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -2214,7 +2214,7 @@ static int rtd_ao_rinsn(struct comedi_device *dev, * comedi core can convert between insn_bits and insn_read/write */ static int rtd_dio_insn_bits(struct comedi_device *dev, - comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { if (insn->n != 2) return -EINVAL; @@ -2241,7 +2241,7 @@ static int rtd_dio_insn_bits(struct comedi_device *dev, Configure one bit on a IO port as Input or Output (hence the name :-). */ static int rtd_dio_insn_config(struct comedi_device *dev, - comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec); |