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/adv_pci1710.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/adv_pci1710.c')
-rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1710.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 75d915310e01..e66c2560b2cd 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -304,14 +304,14 @@ typedef struct { ============================================================================== */ -static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s, +static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, unsigned int *chanlist, unsigned int n_chan); -static void setup_channel_list(struct comedi_device * dev, comedi_subdevice * s, +static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, unsigned int *chanlist, unsigned int n_chan, unsigned int seglen); static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, unsigned int divisor2); static int pci1710_reset(struct comedi_device * dev); -static int pci171x_ai_cancel(struct comedi_device * dev, comedi_subdevice * s); +static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x0404, 0x0505, 0x0606, 0x0707, // used for gain list programming 0x0808, 0x0909, 0x0a0a, 0x0b0b, 0x0c0c, 0x0d0d, 0x0e0e, 0x0f0f, @@ -322,7 +322,7 @@ static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x040 /* ============================================================================== */ -static int pci171x_insn_read_ai(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_read_ai(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n, timeout; @@ -390,7 +390,7 @@ static int pci171x_insn_read_ai(struct comedi_device * dev, comedi_subdevice * s /* ============================================================================== */ -static int pci171x_insn_write_ao(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n, chan, range, ofs; @@ -421,7 +421,7 @@ static int pci171x_insn_write_ao(struct comedi_device * dev, comedi_subdevice * /* ============================================================================== */ -static int pci171x_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n, chan; @@ -436,7 +436,7 @@ static int pci171x_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s /* ============================================================================== */ -static int pci171x_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { data[1] = inw(dev->iobase + PCI171x_DI); @@ -447,7 +447,7 @@ static int pci171x_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s /* ============================================================================== */ -static int pci171x_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (data[0]) { @@ -463,7 +463,7 @@ static int pci171x_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s /* ============================================================================== */ -static int pci171x_insn_counter_read(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_counter_read(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { unsigned int msb, lsb, ccntrl; @@ -485,7 +485,7 @@ static int pci171x_insn_counter_read(struct comedi_device * dev, comedi_subdevic /* ============================================================================== */ -static int pci171x_insn_counter_write(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_insn_counter_write(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { uint msb, lsb, ccntrl, status; @@ -513,7 +513,7 @@ static int pci171x_insn_counter_write(struct comedi_device * dev, comedi_subdevi ============================================================================== */ static int pci171x_insn_counter_config(struct comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { #ifdef unused /* This doesn't work like a normal Comedi counter config */ @@ -548,7 +548,7 @@ static int pci171x_insn_counter_config(struct comedi_device * dev, /* ============================================================================== */ -static int pci1720_insn_write_ao(struct comedi_device * dev, comedi_subdevice * s, +static int pci1720_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n, rangereg, chan; @@ -577,7 +577,7 @@ static int pci1720_insn_write_ao(struct comedi_device * dev, comedi_subdevice * static void interrupt_pci1710_every_sample(void *d) { struct comedi_device *dev = d; - comedi_subdevice *s = dev->subdevices + 0; + struct comedi_subdevice *s = dev->subdevices + 0; int m; #ifdef PCI171x_PARANOIDCHECK short sampl; @@ -659,7 +659,7 @@ static void interrupt_pci1710_every_sample(void *d) /* ============================================================================== */ -static int move_block_from_fifo(struct comedi_device * dev, comedi_subdevice * s, +static int move_block_from_fifo(struct comedi_device * dev, struct comedi_subdevice * s, int n, int turn) { int i, j; @@ -708,7 +708,7 @@ static int move_block_from_fifo(struct comedi_device * dev, comedi_subdevice * s static void interrupt_pci1710_half_fifo(void *d) { struct comedi_device *dev = d; - comedi_subdevice *s = dev->subdevices + 0; + struct comedi_subdevice *s = dev->subdevices + 0; int m, samplesinbuf; DPRINTK("adv_pci1710 EDBG: BGN: interrupt_pci1710_half_fifo(...)\n"); @@ -802,7 +802,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG) ============================================================================== */ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device * dev, - comedi_subdevice * s) + struct comedi_subdevice * s) { unsigned int divisor1, divisor2; unsigned int seglen; @@ -900,7 +900,7 @@ static void pci171x_cmdtest_out(int e, comedi_cmd * cmd) /* ============================================================================== */ -static int pci171x_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, +static int pci171x_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd) { int err = 0; @@ -1065,7 +1065,7 @@ static int pci171x_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, /* ============================================================================== */ -static int pci171x_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) +static int pci171x_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) { comedi_cmd *cmd = &s->async->cmd; @@ -1104,7 +1104,7 @@ static int pci171x_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) If it's ok, then program scan/gain logic. This works for all cards. */ -static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s, +static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, unsigned int *chanlist, unsigned int n_chan) { unsigned int chansegment[32]; @@ -1163,7 +1163,7 @@ static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s, return seglen; } -static void setup_channel_list(struct comedi_device * dev, comedi_subdevice * s, +static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) { unsigned int i, range, chanprog; @@ -1220,7 +1220,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis /* ============================================================================== */ -static int pci171x_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) +static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) { DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n"); @@ -1318,7 +1318,7 @@ static int pci1710_reset(struct comedi_device * dev) */ static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it) { - comedi_subdevice *s; + struct comedi_subdevice *s; int ret, subdev, n_subdevices; unsigned int irq; unsigned long iobase; |