diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:56 -0700 |
commit | 71b5f4f11971dea972832ad63a994c7e5b45db6b (patch) | |
tree | a96c8f252e3109b42f9074a9a477c23ce9745ebb /drivers/staging/comedi/drivers/pcmmio.c | |
parent | 790c55415aa31f4c732729f94d2c3a54f7d3bfc2 (diff) |
Staging: comedi: Remove comedi_device 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/pcmmio.c')
-rw-r--r-- | drivers/staging/comedi/drivers/pcmmio.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 739959cd2cfd..77f62cddddb3 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -139,14 +139,14 @@ Configuration Options: #define PAGE_ENAB 2 #define PAGE_INT_ID 3 -typedef int (*comedi_insn_fn_t) (comedi_device *, comedi_subdevice *, +typedef int (*comedi_insn_fn_t) (struct comedi_device *, comedi_subdevice *, comedi_insn *, unsigned int *); -static int ai_rinsn(comedi_device *, comedi_subdevice *, comedi_insn *, +static int ai_rinsn(struct comedi_device *, comedi_subdevice *, comedi_insn *, unsigned int *); -static int ao_rinsn(comedi_device *, comedi_subdevice *, comedi_insn *, +static int ao_rinsn(struct comedi_device *, comedi_subdevice *, comedi_insn *, unsigned int *); -static int ao_winsn(comedi_device *, comedi_subdevice *, comedi_insn *, +static int ao_winsn(struct comedi_device *, comedi_subdevice *, comedi_insn *, unsigned int *); /* @@ -237,7 +237,7 @@ typedef struct { /* this structure is for data unique to this hardware driver. If several hardware drivers keep similar information in this structure, - feel free to suggest moving the variable to the comedi_device struct. */ + feel free to suggest moving the variable to the struct comedi_device struct. */ typedef struct { /* stuff for DIO */ struct { @@ -264,8 +264,8 @@ typedef struct { * the board, and also about the kernel module that contains * the device code. */ -static int pcmmio_attach(comedi_device * dev, comedi_devconfig * it); -static int pcmmio_detach(comedi_device * dev); +static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it); +static int pcmmio_detach(struct comedi_device * dev); static comedi_driver driver = { driver_name:"pcmmio", @@ -295,24 +295,24 @@ static comedi_driver driver = { num_names:sizeof(pcmmio_boards) / sizeof(pcmmio_board), }; -static int pcmmio_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, +static int pcmmio_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data); -static int pcmmio_dio_insn_config(comedi_device * dev, comedi_subdevice * s, +static int pcmmio_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data); static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG); -static void pcmmio_stop_intr(comedi_device *, comedi_subdevice *); -static int pcmmio_cancel(comedi_device * dev, comedi_subdevice * s); -static int pcmmio_cmd(comedi_device * dev, comedi_subdevice * s); -static int pcmmio_cmdtest(comedi_device * dev, comedi_subdevice * s, +static void pcmmio_stop_intr(struct comedi_device *, comedi_subdevice *); +static int pcmmio_cancel(struct comedi_device * dev, comedi_subdevice * s); +static int pcmmio_cmd(struct comedi_device * dev, comedi_subdevice * s); +static int pcmmio_cmdtest(struct comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd); /* some helper functions to deal with specifics of this device's registers */ -static void init_asics(comedi_device * dev); /* sets up/clears ASIC chips to defaults */ -static void switch_page(comedi_device * dev, int asic, int page); +static void init_asics(struct comedi_device * dev); /* sets up/clears ASIC chips to defaults */ +static void switch_page(struct comedi_device * dev, int asic, int page); #ifdef notused -static void lock_port(comedi_device * dev, int asic, int port); -static void unlock_port(comedi_device * dev, int asic, int port); +static void lock_port(struct comedi_device * dev, int asic, int port); +static void unlock_port(struct comedi_device * dev, int asic, int port); #endif /* @@ -321,7 +321,7 @@ static void unlock_port(comedi_device * dev, int asic, int port); * in the driver structure, dev->board_ptr contains that * address. */ -static int pcmmio_attach(comedi_device * dev, comedi_devconfig * it) +static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it) { comedi_subdevice *s; int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic, @@ -526,7 +526,7 @@ static int pcmmio_attach(comedi_device * dev, comedi_devconfig * it) * allocated by _attach(). dev->private and dev->subdevices are * deallocated automatically by the core. */ -static int pcmmio_detach(comedi_device * dev) +static int pcmmio_detach(struct comedi_device * dev) { int i; @@ -550,7 +550,7 @@ static int pcmmio_detach(comedi_device * dev) * useful to applications if you implement the insn_bits interface. * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ -static int pcmmio_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, +static int pcmmio_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int byte_no; @@ -624,7 +624,7 @@ static int pcmmio_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, * configured by a special insn_config instruction. chanspec * contains the channel to be changed, and data[0] contains the * value COMEDI_INPUT or COMEDI_OUTPUT. */ -static int pcmmio_dio_insn_config(comedi_device * dev, comedi_subdevice * s, +static int pcmmio_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = @@ -685,7 +685,7 @@ static int pcmmio_dio_insn_config(comedi_device * dev, comedi_subdevice * s, return insn->n; } -static void init_asics(comedi_device * dev) +static void init_asics(struct comedi_device * dev) { /* sets up an ASIC chip to defaults */ int asic; @@ -722,7 +722,7 @@ static void init_asics(comedi_device * dev) } } -static void switch_page(comedi_device * dev, int asic, int page) +static void switch_page(struct comedi_device * dev, int asic, int page) { if (asic < 0 || asic >= thisboard->dio_num_asics) return; /* paranoia */ @@ -738,7 +738,7 @@ static void switch_page(comedi_device * dev, int asic, int page) } #ifdef notused -static void lock_port(comedi_device * dev, int asic, int port) +static void lock_port(struct comedi_device * dev, int asic, int port) { if (asic < 0 || asic >= thisboard->dio_num_asics) return; /* paranoia */ @@ -752,7 +752,7 @@ static void lock_port(comedi_device * dev, int asic, int port) return; } -static void unlock_port(comedi_device * dev, int asic, int port) +static void unlock_port(struct comedi_device * dev, int asic, int port) { if (asic < 0 || asic >= thisboard->dio_num_asics) return; /* paranoia */ @@ -768,7 +768,7 @@ static void unlock_port(comedi_device * dev, int asic, int port) static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG) { int asic, got1 = 0; - comedi_device *dev = (comedi_device *) d; + struct comedi_device *dev = (struct comedi_device *) d; for (asic = 0; asic < MAX_ASICS; ++asic) { if (irq == devpriv->asics[asic].irq) { @@ -917,7 +917,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG) return IRQ_HANDLED; } -static void pcmmio_stop_intr(comedi_device * dev, comedi_subdevice * s) +static void pcmmio_stop_intr(struct comedi_device * dev, comedi_subdevice * s) { int nports, firstport, asic, port; @@ -936,7 +936,7 @@ static void pcmmio_stop_intr(comedi_device * dev, comedi_subdevice * s) } } -static int pcmmio_start_intr(comedi_device * dev, comedi_subdevice * s) +static int pcmmio_start_intr(struct comedi_device * dev, comedi_subdevice * s) { if (!subpriv->dio.intr.continuous && subpriv->dio.intr.stop_count == 0) { /* An empty acquisition! */ @@ -995,7 +995,7 @@ static int pcmmio_start_intr(comedi_device * dev, comedi_subdevice * s) return 0; } -static int pcmmio_cancel(comedi_device * dev, comedi_subdevice * s) +static int pcmmio_cancel(struct comedi_device * dev, comedi_subdevice * s) { unsigned long flags; @@ -1011,7 +1011,7 @@ static int pcmmio_cancel(comedi_device * dev, comedi_subdevice * s) * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. */ static int -pcmmio_inttrig_start_intr(comedi_device * dev, comedi_subdevice * s, +pcmmio_inttrig_start_intr(struct comedi_device * dev, comedi_subdevice * s, unsigned int trignum) { unsigned long flags; @@ -1037,7 +1037,7 @@ pcmmio_inttrig_start_intr(comedi_device * dev, comedi_subdevice * s, /* * 'do_cmd' function for an 'INTERRUPT' subdevice. */ -static int pcmmio_cmd(comedi_device * dev, comedi_subdevice * s) +static int pcmmio_cmd(struct comedi_device * dev, comedi_subdevice * s) { comedi_cmd *cmd = &s->async->cmd; unsigned long flags; @@ -1082,7 +1082,7 @@ static int pcmmio_cmd(comedi_device * dev, comedi_subdevice * s) * 'do_cmdtest' function for an 'INTERRUPT' subdevice. */ static int -pcmmio_cmdtest(comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd) +pcmmio_cmdtest(struct comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd) { int err = 0; unsigned int tmp; @@ -1194,7 +1194,7 @@ static int adc_wait_ready(unsigned long iobase) } /* All this is for AI and AO */ -static int ai_rinsn(comedi_device * dev, comedi_subdevice * s, +static int ai_rinsn(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n; @@ -1258,7 +1258,7 @@ static int ai_rinsn(comedi_device * dev, comedi_subdevice * s, return n; } -static int ao_rinsn(comedi_device * dev, comedi_subdevice * s, +static int ao_rinsn(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n; @@ -1288,7 +1288,7 @@ static int wait_dac_ready(unsigned long iobase) return 1; } -static int ao_winsn(comedi_device * dev, comedi_subdevice * s, +static int ao_winsn(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int n; |