aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-04-23 15:54:54 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:32 -0400
commit814900c904140cfe7f3e48cabec06b3eec57e0ea (patch)
tree47d75f154dd14fa52b04856a37d5b588d817412f /drivers/staging/comedi
parent9b9bcba0cafa2578cebbe0eca01eaafd49f3e43b (diff)
Staging: comedi: more fix "foo * bar" should be "foo *bar"
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_eeprom.c12
-rw-r--r--drivers/staging/comedi/drivers/amplc_pc236.c18
-rw-r--r--drivers/staging/comedi/drivers/amplc_pci230.c46
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c38
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas.c82
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas64.c104
-rw-r--r--drivers/staging/comedi/drivers/das16.c40
-rw-r--r--drivers/staging/comedi/drivers/das16m1.c30
-rw-r--r--drivers/staging/comedi/drivers/das1800.c56
-rw-r--r--drivers/staging/comedi/drivers/das800.c28
-rw-r--r--drivers/staging/comedi/drivers/dmm32at.c30
-rw-r--r--drivers/staging/comedi/drivers/gsc_hpdi.c16
-rw-r--r--drivers/staging/comedi/drivers/ni_at_a2150.c16
-rw-r--r--drivers/staging/comedi/drivers/ni_atmio16d.c16
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c60
-rw-r--r--drivers/staging/comedi/drivers/pcmmio.c24
-rw-r--r--drivers/staging/comedi/drivers/pcmuio.c24
17 files changed, 320 insertions, 320 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index 8bb0f9a1abb..208ade70ad0 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -124,23 +124,23 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
124 124
125int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress, 125int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
126 char *pc_PCIChipInformation, unsigned short w_Address, 126 char *pc_PCIChipInformation, unsigned short w_Address,
127 struct str_DigitalInputHeader * s_Header); 127 struct str_DigitalInputHeader *s_Header);
128 128
129int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, 129int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
130 char *pc_PCIChipInformation, unsigned short w_Address, 130 char *pc_PCIChipInformation, unsigned short w_Address,
131 struct str_DigitalOutputHeader * s_Header); 131 struct str_DigitalOutputHeader *s_Header);
132 132
133int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, 133int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress,
134 char *pc_PCIChipInformation, unsigned short w_Address, 134 char *pc_PCIChipInformation, unsigned short w_Address,
135 struct str_TimerMainHeader * s_Header); 135 struct str_TimerMainHeader *s_Header);
136 136
137int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress, 137int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress,
138 char *pc_PCIChipInformation, unsigned short w_Address, 138 char *pc_PCIChipInformation, unsigned short w_Address,
139 str_AnalogOutputHeader * s_Header); 139 str_AnalogOutputHeader *s_Header);
140 140
141int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress, 141int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress,
142 char *pc_PCIChipInformation, unsigned short w_Address, 142 char *pc_PCIChipInformation, unsigned short w_Address,
143 struct str_AnalogInputHeader * s_Header); 143 struct str_AnalogInputHeader *s_Header);
144 144
145 /******************************************/ 145 /******************************************/
146 /* Eeprom Specific Functions */ 146 /* Eeprom Specific Functions */
@@ -1082,7 +1082,7 @@ int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress,
1082 1082
1083int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress, 1083int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress,
1084 char *pc_PCIChipInformation, unsigned short w_Address, 1084 char *pc_PCIChipInformation, unsigned short w_Address,
1085 str_AnalogOutputHeader * s_Header) 1085 str_AnalogOutputHeader *s_Header)
1086{ 1086{
1087 unsigned short w_Temp; 1087 unsigned short w_Temp;
1088 /* No of channels for 1st hard component */ 1088 /* No of channels for 1st hard component */
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 57e57c670ec..3befe507ce2 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -187,15 +187,15 @@ COMEDI_INITCLEANUP(driver_amplc_pc236);
187 187
188static int pc236_request_region(unsigned minor, unsigned long from, 188static int pc236_request_region(unsigned minor, unsigned long from,
189 unsigned long extent); 189 unsigned long extent);
190static void pc236_intr_disable(struct comedi_device * dev); 190static void pc236_intr_disable(struct comedi_device *dev);
191static void pc236_intr_enable(struct comedi_device * dev); 191static void pc236_intr_enable(struct comedi_device *dev);
192static int pc236_intr_check(struct comedi_device * dev); 192static int pc236_intr_check(struct comedi_device *dev);
193static int pc236_intr_insn(struct comedi_device * dev, struct comedi_subdevice * s, 193static int pc236_intr_insn(struct comedi_device *dev, struct comedi_subdevice *s,
194 struct comedi_insn * insn, unsigned int * data); 194 struct comedi_insn *insn, unsigned int *data);
195static int pc236_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 195static int pc236_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
196 struct comedi_cmd * cmd); 196 struct comedi_cmd *cmd);
197static int pc236_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 197static int pc236_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
198static int pc236_intr_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 198static int pc236_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
199static irqreturn_t pc236_interrupt(int irq, void *d); 199static irqreturn_t pc236_interrupt(int irq, void *d);
200 200
201/* 201/*
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 94f45029a9c..1d675173cd3 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -617,32 +617,32 @@ static struct comedi_driver driver_amplc_pci230 = {
617 617
618COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table); 618COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table);
619 619
620static int pci230_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 620static int pci230_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
621 struct comedi_insn * insn, unsigned int * data); 621 struct comedi_insn *insn, unsigned int *data);
622static int pci230_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 622static int pci230_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
623 struct comedi_insn * insn, unsigned int * data); 623 struct comedi_insn *insn, unsigned int *data);
624static int pci230_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 624static int pci230_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
625 struct comedi_insn * insn, unsigned int * data); 625 struct comedi_insn *insn, unsigned int *data);
626static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct, 626static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct,
627 unsigned int mode, uint64_t ns, unsigned int round); 627 unsigned int mode, uint64_t ns, unsigned int round);
628static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round); 628static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round);
629static void pci230_cancel_ct(struct comedi_device * dev, unsigned int ct); 629static void pci230_cancel_ct(struct comedi_device *dev, unsigned int ct);
630static irqreturn_t pci230_interrupt(int irq, void *d); 630static irqreturn_t pci230_interrupt(int irq, void *d);
631static int pci230_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 631static int pci230_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
632 struct comedi_cmd * cmd); 632 struct comedi_cmd *cmd);
633static int pci230_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 633static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
634static int pci230_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 634static int pci230_ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
635static void pci230_ao_stop(struct comedi_device * dev, struct comedi_subdevice * s); 635static void pci230_ao_stop(struct comedi_device *dev, struct comedi_subdevice *s);
636static void pci230_handle_ao_nofifo(struct comedi_device * dev, struct comedi_subdevice * s); 636static void pci230_handle_ao_nofifo(struct comedi_device *dev, struct comedi_subdevice *s);
637static int pci230_handle_ao_fifo(struct comedi_device * dev, struct comedi_subdevice * s); 637static int pci230_handle_ao_fifo(struct comedi_device *dev, struct comedi_subdevice *s);
638static int pci230_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 638static int pci230_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
639 struct comedi_cmd * cmd); 639 struct comedi_cmd *cmd);
640static int pci230_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 640static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
641static int pci230_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 641static int pci230_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
642static void pci230_ai_stop(struct comedi_device * dev, struct comedi_subdevice * s); 642static void pci230_ai_stop(struct comedi_device *dev, struct comedi_subdevice *s);
643static void pci230_handle_ai(struct comedi_device * dev, struct comedi_subdevice * s); 643static void pci230_handle_ai(struct comedi_device *dev, struct comedi_subdevice *s);
644 644
645static short pci230_ai_read(struct comedi_device * dev) 645static short pci230_ai_read(struct comedi_device *dev)
646{ 646{
647 /* Read sample. */ 647 /* Read sample. */
648 short data = (short) inw(dev->iobase + PCI230_ADCDATA); 648 short data = (short) inw(dev->iobase + PCI230_ADCDATA);
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 3199249a8fc..516d2ccdaf2 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -109,25 +109,25 @@ static const struct comedi_lrange das16cs_ai_range = { 4, {
109}; 109};
110 110
111static irqreturn_t das16cs_interrupt(int irq, void *d); 111static irqreturn_t das16cs_interrupt(int irq, void *d);
112static int das16cs_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 112static int das16cs_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
113 struct comedi_insn * insn, unsigned int * data); 113 struct comedi_insn *insn, unsigned int *data);
114static int das16cs_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 114static int das16cs_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
115static int das16cs_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 115static int das16cs_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
116 struct comedi_cmd * cmd); 116 struct comedi_cmd *cmd);
117static int das16cs_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 117static int das16cs_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
118 struct comedi_insn * insn, unsigned int * data); 118 struct comedi_insn *insn, unsigned int *data);
119static int das16cs_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 119static int das16cs_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
120 struct comedi_insn * insn, unsigned int * data); 120 struct comedi_insn *insn, unsigned int *data);
121static int das16cs_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, 121static int das16cs_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
122 struct comedi_insn * insn, unsigned int * data); 122 struct comedi_insn *insn, unsigned int *data);
123static int das16cs_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, 123static int das16cs_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
124 struct comedi_insn * insn, unsigned int * data); 124 struct comedi_insn *insn, unsigned int *data);
125static int das16cs_timer_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, 125static int das16cs_timer_insn_read(struct comedi_device *dev, struct comedi_subdevice *s,
126 struct comedi_insn * insn, unsigned int * data); 126 struct comedi_insn *insn, unsigned int *data);
127static int das16cs_timer_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, 127static int das16cs_timer_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
128 struct comedi_insn * insn, unsigned int * data); 128 struct comedi_insn *insn, unsigned int *data);
129 129
130static int get_prodid(struct comedi_device * dev, struct pcmcia_device *link) 130static int get_prodid(struct comedi_device *dev, struct pcmcia_device *link)
131{ 131{
132 tuple_t tuple; 132 tuple_t tuple;
133 u_short buf[128]; 133 u_short buf[128];
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 112480c969a..17dec756748 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -451,56 +451,56 @@ static struct comedi_driver driver_cb_pcidas = {
451}; 451};
452 452
453static int cb_pcidas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice * s, 453static int cb_pcidas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice * s,
454 struct comedi_insn * insn, unsigned int * data); 454 struct comedi_insn *insn, unsigned int *data);
455static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, 455static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s,
456 struct comedi_insn * insn, unsigned int * data); 456 struct comedi_insn *insn, unsigned int *data);
457static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 457static int cb_pcidas_ao_nofifo_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
458 struct comedi_insn * insn, unsigned int * data); 458 struct comedi_insn *insn, unsigned int *data);
459static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 459static int cb_pcidas_ao_fifo_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
460 struct comedi_insn * insn, unsigned int * data); 460 struct comedi_insn *insn, unsigned int *data);
461static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, 461static int cb_pcidas_ao_readback_insn(struct comedi_device *dev, struct comedi_subdevice *s,
462 struct comedi_insn * insn, unsigned int * data); 462 struct comedi_insn *insn, unsigned int *data);
463static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 463static int cb_pcidas_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
464static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 464static int cb_pcidas_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
465 struct comedi_cmd * cmd); 465 struct comedi_cmd *cmd);
466static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 466static int cb_pcidas_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
467static int cb_pcidas_ao_inttrig(struct comedi_device *dev, 467static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
468 struct comedi_subdevice *subdev, 468 struct comedi_subdevice *subdev,
469 unsigned int trig_num); 469 unsigned int trig_num);
470static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 470static int cb_pcidas_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
471 struct comedi_cmd * cmd); 471 struct comedi_cmd *cmd);
472static irqreturn_t cb_pcidas_interrupt(int irq, void *d); 472static irqreturn_t cb_pcidas_interrupt(int irq, void *d);
473static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status); 473static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status);
474static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 474static int cb_pcidas_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
475static int cb_pcidas_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 475static int cb_pcidas_ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
476static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns, 476static void cb_pcidas_load_counters(struct comedi_device *dev, unsigned int *ns,
477 int round_flags); 477 int round_flags);
478static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 478static int eeprom_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
479 struct comedi_insn * insn, unsigned int * data); 479 struct comedi_insn *insn, unsigned int *data);
480static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 480static int caldac_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
481 struct comedi_insn * insn, unsigned int * data); 481 struct comedi_insn *insn, unsigned int *data);
482static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 482static int caldac_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
483 struct comedi_insn * insn, unsigned int * data); 483 struct comedi_insn *insn, unsigned int *data);
484static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 484static int trimpot_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
485 struct comedi_insn * insn, unsigned int * data); 485 struct comedi_insn *insn, unsigned int *data);
486static int cb_pcidas_trimpot_write(struct comedi_device * dev, unsigned int channel, 486static int cb_pcidas_trimpot_write(struct comedi_device *dev, unsigned int channel,
487 unsigned int value); 487 unsigned int value);
488static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 488static int trimpot_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
489 struct comedi_insn * insn, unsigned int * data); 489 struct comedi_insn *insn, unsigned int *data);
490static int dac08_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 490static int dac08_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
491 struct comedi_insn * insn, unsigned int * data); 491 struct comedi_insn *insn, unsigned int *data);
492static int dac08_write(struct comedi_device * dev, unsigned int value); 492static int dac08_write(struct comedi_device *dev, unsigned int value);
493static int dac08_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 493static int dac08_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
494 struct comedi_insn * insn, unsigned int * data); 494 struct comedi_insn *insn, unsigned int *data);
495static int caldac_8800_write(struct comedi_device * dev, unsigned int address, 495static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
496 uint8_t value); 496 uint8_t value);
497static int trimpot_7376_write(struct comedi_device * dev, uint8_t value); 497static int trimpot_7376_write(struct comedi_device *dev, uint8_t value);
498static int trimpot_8402_write(struct comedi_device * dev, unsigned int channel, 498static int trimpot_8402_write(struct comedi_device *dev, unsigned int channel,
499 uint8_t value); 499 uint8_t value);
500static int nvram_read(struct comedi_device * dev, unsigned int address, 500static int nvram_read(struct comedi_device *dev, unsigned int address,
501 uint8_t * data); 501 uint8_t *data);
502 502
503static inline unsigned int cal_enable_bits(struct comedi_device * dev) 503static inline unsigned int cal_enable_bits(struct comedi_device *dev)
504{ 504{
505 return CAL_EN_BIT | CAL_SRC_BITS(devpriv->calibration_source); 505 return CAL_EN_BIT | CAL_SRC_BITS(devpriv->calibration_source);
506} 506}
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 49dfd8f09e2..adce530adc5 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1137,73 +1137,73 @@ static struct comedi_driver driver_cb_pcidas = {
1137 .detach = detach, 1137 .detach = detach,
1138}; 1138};
1139 1139
1140static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 1140static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
1141 struct comedi_insn * insn, unsigned int * data); 1141 struct comedi_insn *insn, unsigned int *data);
1142static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1142static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1143 struct comedi_insn * insn, unsigned int * data); 1143 struct comedi_insn *insn, unsigned int *data);
1144static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 1144static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
1145 struct comedi_insn * insn, unsigned int * data); 1145 struct comedi_insn *insn, unsigned int *data);
1146static int ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1146static int ao_readback_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1147 struct comedi_insn * insn, unsigned int * data); 1147 struct comedi_insn *insn, unsigned int *data);
1148static int ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 1148static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
1149static int ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 1149static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
1150 struct comedi_cmd * cmd); 1150 struct comedi_cmd *cmd);
1151static int ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 1151static int ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
1152static int ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * subdev, 1152static int ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *subdev,
1153 unsigned int trig_num); 1153 unsigned int trig_num);
1154static int ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 1154static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
1155 struct comedi_cmd * cmd); 1155 struct comedi_cmd *cmd);
1156static irqreturn_t handle_interrupt(int irq, void *d); 1156static irqreturn_t handle_interrupt(int irq, void *d);
1157static int ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 1157static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
1158static int ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 1158static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
1159static int dio_callback(int dir, int port, int data, unsigned long arg); 1159static int dio_callback(int dir, int port, int data, unsigned long arg);
1160static int dio_callback_4020(int dir, int port, int data, unsigned long arg); 1160static int dio_callback_4020(int dir, int port, int data, unsigned long arg);
1161static int di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, 1161static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
1162 struct comedi_insn * insn, unsigned int * data); 1162 struct comedi_insn *insn, unsigned int *data);
1163static int do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, 1163static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
1164 struct comedi_insn * insn, unsigned int * data); 1164 struct comedi_insn *insn, unsigned int *data);
1165static int dio_60xx_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1165static int dio_60xx_config_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1166 struct comedi_insn * insn, unsigned int * data); 1166 struct comedi_insn *insn, unsigned int *data);
1167static int dio_60xx_wbits(struct comedi_device * dev, struct comedi_subdevice * s, 1167static int dio_60xx_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
1168 struct comedi_insn * insn, unsigned int * data); 1168 struct comedi_insn *insn, unsigned int *data);
1169static int calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1169static int calib_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1170 struct comedi_insn * insn, unsigned int * data); 1170 struct comedi_insn *insn, unsigned int *data);
1171static int calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1171static int calib_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1172 struct comedi_insn * insn, unsigned int * data); 1172 struct comedi_insn *insn, unsigned int *data);
1173static int ad8402_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1173static int ad8402_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1174 struct comedi_insn * insn, unsigned int * data); 1174 struct comedi_insn *insn, unsigned int *data);
1175static void ad8402_write(struct comedi_device * dev, unsigned int channel, 1175static void ad8402_write(struct comedi_device *dev, unsigned int channel,
1176 unsigned int value); 1176 unsigned int value);
1177static int ad8402_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1177static int ad8402_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1178 struct comedi_insn * insn, unsigned int * data); 1178 struct comedi_insn *insn, unsigned int *data);
1179static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 1179static int eeprom_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
1180 struct comedi_insn * insn, unsigned int * data); 1180 struct comedi_insn *insn, unsigned int *data);
1181static void check_adc_timing(struct comedi_device * dev, struct comedi_cmd * cmd); 1181static void check_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd);
1182static unsigned int get_divisor(unsigned int ns, unsigned int flags); 1182static unsigned int get_divisor(unsigned int ns, unsigned int flags);
1183static void i2c_write(struct comedi_device * dev, unsigned int address, 1183static void i2c_write(struct comedi_device *dev, unsigned int address,
1184 const uint8_t * data, unsigned int length); 1184 const uint8_t *data, unsigned int length);
1185static void caldac_write(struct comedi_device * dev, unsigned int channel, 1185static void caldac_write(struct comedi_device *dev, unsigned int channel,
1186 unsigned int value); 1186 unsigned int value);
1187static int caldac_8800_write(struct comedi_device * dev, unsigned int address, 1187static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
1188 uint8_t value); 1188 uint8_t value);
1189/* static int dac_1590_write(struct comedi_device *dev, unsigned int dac_a, unsigned int dac_b); */ 1189/* static int dac_1590_write(struct comedi_device *dev, unsigned int dac_a, unsigned int dac_b); */
1190static int caldac_i2c_write(struct comedi_device * dev, unsigned int caldac_channel, 1190static int caldac_i2c_write(struct comedi_device *dev, unsigned int caldac_channel,
1191 unsigned int value); 1191 unsigned int value);
1192static void abort_dma(struct comedi_device * dev, unsigned int channel); 1192static void abort_dma(struct comedi_device *dev, unsigned int channel);
1193static void disable_plx_interrupts(struct comedi_device * dev); 1193static void disable_plx_interrupts(struct comedi_device *dev);
1194static int set_ai_fifo_size(struct comedi_device * dev, unsigned int num_samples); 1194static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples);
1195static unsigned int ai_fifo_size(struct comedi_device * dev); 1195static unsigned int ai_fifo_size(struct comedi_device *dev);
1196static int set_ai_fifo_segment_length(struct comedi_device * dev, 1196static int set_ai_fifo_segment_length(struct comedi_device *dev,
1197 unsigned int num_entries); 1197 unsigned int num_entries);
1198static void disable_ai_pacing(struct comedi_device * dev); 1198static void disable_ai_pacing(struct comedi_device *dev);
1199static void disable_ai_interrupts(struct comedi_device * dev); 1199static void disable_ai_interrupts(struct comedi_device *dev);
1200static void enable_ai_interrupts(struct comedi_device * dev, const struct comedi_cmd * cmd); 1200static void enable_ai_interrupts(struct comedi_device *dev, const struct comedi_cmd *cmd);
1201static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags); 1201static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags);
1202static void load_ao_dma(struct comedi_device * dev, const struct comedi_cmd * cmd); 1202static void load_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd);
1203 1203
1204COMEDI_PCI_INITCLEANUP(driver_cb_pcidas, pcidas64_pci_table); 1204COMEDI_PCI_INITCLEANUP(driver_cb_pcidas, pcidas64_pci_table);
1205 1205
1206static unsigned int ai_range_bits_6xxx(const struct comedi_device * dev, 1206static unsigned int ai_range_bits_6xxx(const struct comedi_device *dev,
1207 unsigned int range_index) 1207 unsigned int range_index)
1208{ 1208{
1209 const struct comedi_krange *range = 1209 const struct comedi_krange *range =
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 4433f6446b3..982837d879c 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -326,34 +326,34 @@ struct munge_info {
326 unsigned have_byte:1; 326 unsigned have_byte:1;
327}; 327};
328 328
329static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 329static int das16_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
330 struct comedi_insn * insn, unsigned int * data); 330 struct comedi_insn *insn, unsigned int *data);
331static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, 331static int das16_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
332 struct comedi_insn * insn, unsigned int * data); 332 struct comedi_insn *insn, unsigned int *data);
333static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, 333static int das16_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
334 struct comedi_insn * insn, unsigned int * data); 334 struct comedi_insn *insn, unsigned int *data);
335static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 335static int das16_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
336 struct comedi_insn * insn, unsigned int * data); 336 struct comedi_insn *insn, unsigned int *data);
337 337
338static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, 338static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
339 struct comedi_cmd * cmd); 339 struct comedi_cmd *cmd);
340static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s); 340static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s);
341static int das16_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 341static int das16_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
342static void das16_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, 342static void das16_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s,
343 void *array, unsigned int num_bytes, unsigned int start_chan_index); 343 void *array, unsigned int num_bytes, unsigned int start_chan_index);
344 344
345static void das16_reset(struct comedi_device * dev); 345static void das16_reset(struct comedi_device *dev);
346static irqreturn_t das16_dma_interrupt(int irq, void *d); 346static irqreturn_t das16_dma_interrupt(int irq, void *d);
347static void das16_timer_interrupt(unsigned long arg); 347static void das16_timer_interrupt(unsigned long arg);
348static void das16_interrupt(struct comedi_device * dev); 348static void das16_interrupt(struct comedi_device *dev);
349 349
350static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns, 350static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns,
351 int flags); 351 int flags);
352static int das1600_mode_detect(struct comedi_device * dev); 352static int das1600_mode_detect(struct comedi_device *dev);
353static unsigned int das16_suggest_transfer_size(struct comedi_device * dev, 353static unsigned int das16_suggest_transfer_size(struct comedi_device *dev,
354 struct comedi_cmd cmd); 354 struct comedi_cmd cmd);
355 355
356static void reg_dump(struct comedi_device * dev); 356static void reg_dump(struct comedi_device *dev);
357 357
358struct das16_board { 358struct das16_board {
359 const char *name; 359 const char *name;
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index 031d6307c09..91b1a0e7575 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -131,23 +131,23 @@ static const struct comedi_lrange range_das16m1 = { 9,
131 } 131 }
132}; 132};
133 133
134static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, 134static int das16m1_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
135 struct comedi_insn * insn, unsigned int * data); 135 struct comedi_insn *insn, unsigned int *data);
136static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, 136static int das16m1_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
137 struct comedi_insn * insn, unsigned int * data); 137 struct comedi_insn *insn, unsigned int *data);
138static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 138static int das16m1_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
139 struct comedi_insn * insn, unsigned int * data); 139 struct comedi_insn *insn, unsigned int *data);
140 140
141static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, 141static int das16m1_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
142 struct comedi_cmd * cmd); 142 struct comedi_cmd *cmd);
143static int das16m1_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s); 143static int das16m1_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s);
144static int das16m1_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 144static int das16m1_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
145 145
146static int das16m1_poll(struct comedi_device * dev, struct comedi_subdevice * s); 146static int das16m1_poll(struct comedi_device *dev, struct comedi_subdevice *s);
147static irqreturn_t das16m1_interrupt(int irq, void *d); 147static irqreturn_t das16m1_interrupt(int irq, void *d);
148static void das16m1_handler(struct comedi_device * dev, unsigned int status); 148static void das16m1_handler(struct comedi_device *dev, unsigned int status);
149 149
150static unsigned int das16m1_set_pacer(struct comedi_device * dev, unsigned int ns, 150static unsigned int das16m1_set_pacer(struct comedi_device *dev, unsigned int ns,
151 int round_flag); 151 int round_flag);
152 152
153static int das16m1_irq_bits(unsigned int irq); 153static int das16m1_irq_bits(unsigned int irq);
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index b420e7649bc..9c6c9b89558 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -180,37 +180,37 @@ enum {
180 das1802hr, das1802hr_da, das1801hc, das1802hc, das1801ao, das1802ao 180 das1802hr, das1802hr_da, das1801hc, das1802hc, das1801ao, das1802ao
181}; 181};
182 182
183static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig * it); 183static int das1800_attach(struct comedi_device *dev, struct comedi_devconfig *it);
184static int das1800_detach(struct comedi_device * dev); 184static int das1800_detach(struct comedi_device *dev);
185static int das1800_probe(struct comedi_device * dev); 185static int das1800_probe(struct comedi_device *dev);
186static int das1800_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 186static int das1800_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
187static irqreturn_t das1800_interrupt(int irq, void *d); 187static irqreturn_t das1800_interrupt(int irq, void *d);
188static int das1800_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s); 188static int das1800_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s);
189static void das1800_ai_handler(struct comedi_device * dev); 189static void das1800_ai_handler(struct comedi_device *dev);
190static void das1800_handle_dma(struct comedi_device * dev, struct comedi_subdevice * s, 190static void das1800_handle_dma(struct comedi_device *dev, struct comedi_subdevice *s,
191 unsigned int status); 191 unsigned int status);
192static void das1800_flush_dma(struct comedi_device * dev, struct comedi_subdevice * s); 192static void das1800_flush_dma(struct comedi_device *dev, struct comedi_subdevice *s);
193static void das1800_flush_dma_channel(struct comedi_device * dev, struct comedi_subdevice * s, 193static void das1800_flush_dma_channel(struct comedi_device *dev, struct comedi_subdevice *s,
194 unsigned int channel, uint16_t * buffer); 194 unsigned int channel, uint16_t *buffer);
195static void das1800_handle_fifo_half_full(struct comedi_device * dev, 195static void das1800_handle_fifo_half_full(struct comedi_device *dev,
196 struct comedi_subdevice * s); 196 struct comedi_subdevice *s);
197static void das1800_handle_fifo_not_empty(struct comedi_device * dev, 197static void das1800_handle_fifo_not_empty(struct comedi_device *dev,
198 struct comedi_subdevice * s); 198 struct comedi_subdevice *s);
199static int das1800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 199static int das1800_ai_do_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
200 struct comedi_cmd * cmd); 200 struct comedi_cmd *cmd);
201static int das1800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 201static int das1800_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
202static int das1800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 202static int das1800_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
203 struct comedi_insn * insn, unsigned int * data); 203 struct comedi_insn *insn, unsigned int *data);
204static int das1800_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 204static int das1800_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
205 struct comedi_insn * insn, unsigned int * data); 205 struct comedi_insn *insn, unsigned int *data);
206static int das1800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, 206static int das1800_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
207 struct comedi_insn * insn, unsigned int * data); 207 struct comedi_insn *insn, unsigned int *data);
208static int das1800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, 208static int das1800_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
209 struct comedi_insn * insn, unsigned int * data); 209 struct comedi_insn *insn, unsigned int *data);
210 210
211static int das1800_set_frequency(struct comedi_device * dev); 211static int das1800_set_frequency(struct comedi_device *dev);
212static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode); 212static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode);
213static unsigned int suggest_transfer_size(struct comedi_cmd * cmd); 213static unsigned int suggest_transfer_size(struct comedi_cmd *cmd);
214 214
215/* analog input ranges */ 215/* analog input ranges */
216static const struct comedi_lrange range_ai_das1801 = { 216static const struct comedi_lrange range_ai_das1801 = {
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 71aeae3d57a..db646598619 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -257,22 +257,22 @@ static struct comedi_driver driver_das800 = {
257}; 257};
258 258
259static irqreturn_t das800_interrupt(int irq, void *d); 259static irqreturn_t das800_interrupt(int irq, void *d);
260static void enable_das800(struct comedi_device * dev); 260static void enable_das800(struct comedi_device *dev);
261static void disable_das800(struct comedi_device * dev); 261static void disable_das800(struct comedi_device *dev);
262static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 262static int das800_ai_do_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
263 struct comedi_cmd * cmd); 263 struct comedi_cmd *cmd);
264static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 264static int das800_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
265static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 265static int das800_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
266 struct comedi_insn * insn, unsigned int * data); 266 struct comedi_insn *insn, unsigned int *data);
267static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, 267static int das800_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
268 struct comedi_insn * insn, unsigned int * data); 268 struct comedi_insn *insn, unsigned int *data);
269static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, 269static int das800_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s,
270 struct comedi_insn * insn, unsigned int * data); 270 struct comedi_insn *insn, unsigned int *data);
271static int das800_probe(struct comedi_device * dev); 271static int das800_probe(struct comedi_device *dev);
272static int das800_set_frequency(struct comedi_device * dev); 272static int das800_set_frequency(struct comedi_device *dev);
273 273
274/* checks and probes das-800 series board type */ 274/* checks and probes das-800 series board type */
275static int das800_probe(struct comedi_device * dev) 275static int das800_probe(struct comedi_device *dev)
276{ 276{
277 int id_bits; 277 int id_bits;
278 unsigned long irq_flags; 278 unsigned long irq_flags;
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index ce53d161a69..e7c5130de8d 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -289,23 +289,23 @@ static struct comedi_driver driver_dmm32at = {
289}; 289};
290 290
291/* prototypes for driver functions below */ 291/* prototypes for driver functions below */
292static int dmm32at_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 292static int dmm32at_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
293 struct comedi_insn * insn, unsigned int * data); 293 struct comedi_insn *insn, unsigned int *data);
294static int dmm32at_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 294static int dmm32at_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
295 struct comedi_insn * insn, unsigned int * data); 295 struct comedi_insn *insn, unsigned int *data);
296static int dmm32at_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 296static int dmm32at_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
297 struct comedi_insn * insn, unsigned int * data); 297 struct comedi_insn *insn, unsigned int *data);
298static int dmm32at_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, 298static int dmm32at_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
299 struct comedi_insn * insn, unsigned int * data); 299 struct comedi_insn *insn, unsigned int *data);
300static int dmm32at_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, 300static int dmm32at_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
301 struct comedi_insn * insn, unsigned int * data); 301 struct comedi_insn *insn, unsigned int *data);
302static int dmm32at_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 302static int dmm32at_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
303 struct comedi_cmd * cmd); 303 struct comedi_cmd *cmd);
304static int dmm32at_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 304static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
305static int dmm32at_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 305static int dmm32at_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
306static int dmm32at_ns_to_timer(unsigned int *ns, int round); 306static int dmm32at_ns_to_timer(unsigned int *ns, int round);
307static irqreturn_t dmm32at_isr(int irq, void *d); 307static irqreturn_t dmm32at_isr(int irq, void *d);
308void dmm32at_setaitimer(struct comedi_device * dev, unsigned int nansec); 308void dmm32at_setaitimer(struct comedi_device *dev, unsigned int nansec);
309 309
310/* 310/*
311 * Attach is called by the Comedi core to configure the driver 311 * Attach is called by the Comedi core to configure the driver
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 567dd5290e8..098a78e9307 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -52,15 +52,15 @@ support could be added to this driver.
52#include "plx9080.h" 52#include "plx9080.h"
53#include "comedi_fc.h" 53#include "comedi_fc.h"
54 54
55static int hpdi_attach(struct comedi_device * dev, struct comedi_devconfig * it); 55static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it);
56static int hpdi_detach(struct comedi_device * dev); 56static int hpdi_detach(struct comedi_device *dev);
57void abort_dma(struct comedi_device * dev, unsigned int channel); 57void abort_dma(struct comedi_device *dev, unsigned int channel);
58static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 58static int hpdi_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
59static int hpdi_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, 59static int hpdi_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
60 struct comedi_cmd * cmd); 60 struct comedi_cmd *cmd);
61static int hpdi_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 61static int hpdi_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
62static irqreturn_t handle_interrupt(int irq, void *d); 62static irqreturn_t handle_interrupt(int irq, void *d);
63static int dio_config_block_size(struct comedi_device * dev, unsigned int * data); 63static int dio_config_block_size(struct comedi_device *dev, unsigned int *data);
64 64
65#undef HPDI_DEBUG /* disable debugging messages */ 65#undef HPDI_DEBUG /* disable debugging messages */
66/* #define HPDI_DEBUG enable debugging code */ 66/* #define HPDI_DEBUG enable debugging code */
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 0e42f18cdbf..e6afc42d5d3 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -181,15 +181,15 @@ static struct comedi_driver driver_a2150 = {
181}; 181};
182 182
183static irqreturn_t a2150_interrupt(int irq, void *d); 183static irqreturn_t a2150_interrupt(int irq, void *d);
184static int a2150_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 184static int a2150_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
185 struct comedi_cmd * cmd); 185 struct comedi_cmd *cmd);
186static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 186static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
187static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 187static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
188 struct comedi_insn * insn, unsigned int * data); 188 struct comedi_insn *insn, unsigned int *data);
189static int a2150_get_timing(struct comedi_device * dev, unsigned int *period, 189static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
190 int flags); 190 int flags);
191static int a2150_probe(struct comedi_device * dev); 191static int a2150_probe(struct comedi_device *dev);
192static int a2150_set_chanlist(struct comedi_device * dev, unsigned int start_channel, 192static int a2150_set_chanlist(struct comedi_device *dev, unsigned int start_channel,
193 unsigned int num_channels); 193 unsigned int num_channels);
194/* 194/*
195 * A convenient macro that defines init_module() and cleanup_module(), 195 * A convenient macro that defines init_module() and cleanup_module(),
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index b02d2f33d52..215f7a0e9d3 100644
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -125,15 +125,15 @@ static const struct atmio16_board_t atmio16_boards[] = {
125#define boardtype ((const struct atmio16_board_t *)dev->board_ptr) 125#define boardtype ((const struct atmio16_board_t *)dev->board_ptr)
126 126
127/* function prototypes */ 127/* function prototypes */
128static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig * it); 128static int atmio16d_attach(struct comedi_device *dev, struct comedi_devconfig *it);
129static int atmio16d_detach(struct comedi_device * dev); 129static int atmio16d_detach(struct comedi_device *dev);
130static irqreturn_t atmio16d_interrupt(int irq, void *d); 130static irqreturn_t atmio16d_interrupt(int irq, void *d);
131static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 131static int atmio16d_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
132 struct comedi_cmd * cmd); 132 struct comedi_cmd *cmd);
133static int atmio16d_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 133static int atmio16d_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
134static int atmio16d_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 134static int atmio16d_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
135static void reset_counters(struct comedi_device * dev); 135static void reset_counters(struct comedi_device *dev);
136static void reset_atmio16d(struct comedi_device * dev); 136static void reset_atmio16d(struct comedi_device *dev);
137 137
138/* main driver struct */ 138/* main driver struct */
139static struct comedi_driver driver_atmio16d = { 139static struct comedi_driver driver_atmio16d = {
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index e6ee7d94ca9..d1a2b506503 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -163,46 +163,46 @@ NI manuals:
163#define INIT_A1_BITS 0x70 /* put hardware conversion counter output in harmless state (a1 mode 0) */ 163#define INIT_A1_BITS 0x70 /* put hardware conversion counter output in harmless state (a1 mode 0) */
164#define COUNTER_B_BASE_REG 0x18 164#define COUNTER_B_BASE_REG 0x18
165 165
166static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it); 166static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it);
167static int labpc_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 167static int labpc_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
168static irqreturn_t labpc_interrupt(int irq, void *d); 168static irqreturn_t labpc_interrupt(int irq, void *d);
169static int labpc_drain_fifo(struct comedi_device * dev); 169static int labpc_drain_fifo(struct comedi_device *dev);
170static void labpc_drain_dma(struct comedi_device * dev); 170static void labpc_drain_dma(struct comedi_device *dev);
171static void handle_isa_dma(struct comedi_device * dev); 171static void handle_isa_dma(struct comedi_device *dev);
172static void labpc_drain_dregs(struct comedi_device * dev); 172static void labpc_drain_dregs(struct comedi_device *dev);
173static int labpc_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 173static int labpc_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
174 struct comedi_cmd * cmd); 174 struct comedi_cmd *cmd);
175static int labpc_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 175static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
176static int labpc_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 176static int labpc_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
177 struct comedi_insn * insn, unsigned int * data); 177 struct comedi_insn *insn, unsigned int *data);
178static int labpc_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, 178static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
179 struct comedi_insn * insn, unsigned int * data); 179 struct comedi_insn *insn, unsigned int *data);
180static int labpc_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, 180static int labpc_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
181 struct comedi_insn * insn, unsigned int * data); 181 struct comedi_insn *insn, unsigned int *data);
182static int labpc_calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 182static int labpc_calib_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
183 struct comedi_insn * insn, unsigned int * data); 183 struct comedi_insn *insn, unsigned int *data);
184static int labpc_calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 184static int labpc_calib_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
185 struct comedi_insn * insn, unsigned int * data); 185 struct comedi_insn *insn, unsigned int *data);
186static int labpc_eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, 186static int labpc_eeprom_read_insn(struct comedi_device *dev, struct comedi_subdevice *s,
187 struct comedi_insn * insn, unsigned int * data); 187 struct comedi_insn *insn, unsigned int *data);
188static int labpc_eeprom_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, 188static int labpc_eeprom_write_insn(struct comedi_device *dev, struct comedi_subdevice *s,
189 struct comedi_insn * insn, unsigned int * data); 189 struct comedi_insn *insn, unsigned int *data);
190static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); 190static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd);
191static void labpc_adc_timing(struct comedi_device * dev, struct comedi_cmd * cmd); 191static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd);
192#ifdef CONFIG_COMEDI_PCI 192#ifdef CONFIG_COMEDI_PCI
193static int labpc_find_device(struct comedi_device *dev, int bus, int slot); 193static int labpc_find_device(struct comedi_device *dev, int bus, int slot);
194#endif 194#endif
195static int labpc_dio_mem_callback(int dir, int port, int data, 195static int labpc_dio_mem_callback(int dir, int port, int data,
196 unsigned long arg); 196 unsigned long arg);
197static void labpc_serial_out(struct comedi_device * dev, unsigned int value, 197static void labpc_serial_out(struct comedi_device *dev, unsigned int value,
198 unsigned int num_bits); 198 unsigned int num_bits);
199static unsigned int labpc_serial_in(struct comedi_device * dev); 199static unsigned int labpc_serial_in(struct comedi_device *dev);
200static unsigned int labpc_eeprom_read(struct comedi_device * dev, 200static unsigned int labpc_eeprom_read(struct comedi_device *dev,
201 unsigned int address); 201 unsigned int address);
202static unsigned int labpc_eeprom_read_status(struct comedi_device * dev); 202static unsigned int labpc_eeprom_read_status(struct comedi_device *dev);
203static unsigned int labpc_eeprom_write(struct comedi_device * dev, 203static unsigned int labpc_eeprom_write(struct comedi_device *dev,
204 unsigned int address, unsigned int value); 204 unsigned int address, unsigned int value);
205static void write_caldac(struct comedi_device * dev, unsigned int channel, 205static void write_caldac(struct comedi_device *dev, unsigned int channel,
206 unsigned int value); 206 unsigned int value);
207 207
208enum scan_mode { 208enum scan_mode {
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index de444fff8d3..9d025ab5b9f 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -295,24 +295,24 @@ static struct comedi_driver driver = {
295 .num_names = sizeof(pcmmio_boards) / sizeof(struct pcmmio_board), 295 .num_names = sizeof(pcmmio_boards) / sizeof(struct pcmmio_board),
296}; 296};
297 297
298static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, 298static int pcmmio_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
299 struct comedi_insn * insn, unsigned int * data); 299 struct comedi_insn *insn, unsigned int *data);
300static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, 300static int pcmmio_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
301 struct comedi_insn * insn, unsigned int * data); 301 struct comedi_insn *insn, unsigned int *data);
302 302
303static irqreturn_t interrupt_pcmmio(int irq, void *d); 303static irqreturn_t interrupt_pcmmio(int irq, void *d);
304static void pcmmio_stop_intr(struct comedi_device *, struct comedi_subdevice *); 304static void pcmmio_stop_intr(struct comedi_device *, struct comedi_subdevice *);
305static int pcmmio_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 305static int pcmmio_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
306static int pcmmio_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 306static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
307static int pcmmio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 307static int pcmmio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
308 struct comedi_cmd * cmd); 308 struct comedi_cmd *cmd);
309 309
310/* some helper functions to deal with specifics of this device's registers */ 310/* some helper functions to deal with specifics of this device's registers */
311static void init_asics(struct comedi_device * dev); /* sets up/clears ASIC chips to defaults */ 311static void init_asics(struct comedi_device *dev); /* sets up/clears ASIC chips to defaults */
312static void switch_page(struct comedi_device * dev, int asic, int page); 312static void switch_page(struct comedi_device *dev, int asic, int page);
313#ifdef notused 313#ifdef notused
314static void lock_port(struct comedi_device * dev, int asic, int port); 314static void lock_port(struct comedi_device *dev, int asic, int port);
315static void unlock_port(struct comedi_device * dev, int asic, int port); 315static void unlock_port(struct comedi_device *dev, int asic, int port);
316#endif 316#endif
317 317
318/* 318/*
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index bf419e0445b..e515eadc0fb 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -253,24 +253,24 @@ static struct comedi_driver driver = {
253 .num_names = sizeof(pcmuio_boards) / sizeof(struct pcmuio_board), 253 .num_names = sizeof(pcmuio_boards) / sizeof(struct pcmuio_board),
254}; 254};
255 255
256static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, 256static int pcmuio_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
257 struct comedi_insn * insn, unsigned int * data); 257 struct comedi_insn *insn, unsigned int *data);
258static int pcmuio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, 258static int pcmuio_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
259 struct comedi_insn * insn, unsigned int * data); 259 struct comedi_insn *insn, unsigned int *data);
260 260
261static irqreturn_t interrupt_pcmuio(int irq, void *d); 261static irqreturn_t interrupt_pcmuio(int irq, void *d);
262static void pcmuio_stop_intr(struct comedi_device *, struct comedi_subdevice *); 262static void pcmuio_stop_intr(struct comedi_device *, struct comedi_subdevice *);
263static int pcmuio_cancel(struct comedi_device * dev, struct comedi_subdevice * s); 263static int pcmuio_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
264static int pcmuio_cmd(struct comedi_device * dev, struct comedi_subdevice * s); 264static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
265static int pcmuio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, 265static int pcmuio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
266 struct comedi_cmd * cmd); 266 struct comedi_cmd *cmd);
267 267
268/* some helper functions to deal with specifics of this device's registers */ 268/* some helper functions to deal with specifics of this device's registers */
269static void init_asics(struct comedi_device * dev); /* sets up/clears ASIC chips to defaults */ 269static void init_asics(struct comedi_device *dev); /* sets up/clears ASIC chips to defaults */
270static void switch_page(struct comedi_device * dev, int asic, int page); 270static void switch_page(struct comedi_device *dev, int asic, int page);
271#ifdef notused 271#ifdef notused
272static void lock_port(struct comedi_device * dev, int asic, int port); 272static void lock_port(struct comedi_device *dev, int asic, int port);
273static void unlock_port(struct comedi_device * dev, int asic, int port); 273static void unlock_port(struct comedi_device *dev, int asic, int port);
274#endif 274#endif
275 275
276/* 276/*
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 21:29:00 -0400