aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-04-22 21:11:49 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:32 -0400
commit68c3dbff9fc9f25872408d0e95980d41733d48d0 (patch)
treeae965b1511832380aac7fe589a92bcaac9836b6b /drivers/staging
parentdae0dc30be7fa21b15a9d9534589286c6c3e68a3 (diff)
Staging: comedi: fix the way structs are initialized.
Change from the foo: bar format to the .foo = bar format. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/8255.c8
-rw-r--r--drivers/staging/comedi/drivers/acl7225b.c14
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_common.c16
-rw-r--r--drivers/staging/comedi/drivers/adl_pci6208.c32
-rw-r--r--drivers/staging/comedi/drivers/adl_pci7296.c8
-rw-r--r--drivers/staging/comedi/drivers/adl_pci7432.c8
-rw-r--r--drivers/staging/comedi/drivers/adl_pci8164.c8
-rw-r--r--drivers/staging/comedi/drivers/adl_pci9111.c30
-rw-r--r--drivers/staging/comedi/drivers/adl_pci9118.c14
-rw-r--r--drivers/staging/comedi/drivers/adq12b.c22
-rw-r--r--drivers/staging/comedi/drivers/adv_pci1723.c26
-rw-r--r--drivers/staging/comedi/drivers/adv_pci_dio.c8
-rw-r--r--drivers/staging/comedi/drivers/aio_aio12_8.c16
-rw-r--r--drivers/staging/comedi/drivers/aio_iiro_16.c20
-rw-r--r--drivers/staging/comedi/drivers/amplc_dio200.c132
-rw-r--r--drivers/staging/comedi/drivers/amplc_pc236.c42
-rw-r--r--drivers/staging/comedi/drivers/amplc_pc263.c42
-rw-r--r--drivers/staging/comedi/drivers/amplc_pci224.c40
-rw-r--r--drivers/staging/comedi/drivers/amplc_pci230.c78
-rw-r--r--drivers/staging/comedi/drivers/c6xdigio.c8
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c26
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas.c204
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas64.c722
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidda.c80
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidio.c38
-rw-r--r--drivers/staging/comedi/drivers/cb_pcimdas.c36
-rw-r--r--drivers/staging/comedi/drivers/cb_pcimdda.c26
-rw-r--r--drivers/staging/comedi/drivers/comedi_rt_timer.c10
-rw-r--r--drivers/staging/comedi/drivers/contec_pci_dio.c8
-rw-r--r--drivers/staging/comedi/drivers/daqboard2000.c8
-rw-r--r--drivers/staging/comedi/drivers/das08.c414
-rw-r--r--drivers/staging/comedi/drivers/das08_cs.c14
-rw-r--r--drivers/staging/comedi/drivers/das16.c568
-rw-r--r--drivers/staging/comedi/drivers/das16m1.c18
-rw-r--r--drivers/staging/comedi/drivers/das1800.c338
-rw-r--r--drivers/staging/comedi/drivers/das6402.c8
-rw-r--r--drivers/staging/comedi/drivers/das800.c70
-rw-r--r--drivers/staging/comedi/drivers/dmm32at.c32
-rw-r--r--drivers/staging/comedi/drivers/dt2801.c120
-rw-r--r--drivers/staging/comedi/drivers/dt2811.c14
-rw-r--r--drivers/staging/comedi/drivers/dt2814.c8
-rw-r--r--drivers/staging/comedi/drivers/dt2815.c8
-rw-r--r--drivers/staging/comedi/drivers/dt2817.c8
-rw-r--r--drivers/staging/comedi/drivers/dt282x.c266
-rw-r--r--drivers/staging/comedi/drivers/dt3000.c134
-rw-r--r--drivers/staging/comedi/drivers/fl512.c8
-rw-r--r--drivers/staging/comedi/drivers/gsc_hpdi.c20
-rw-r--r--drivers/staging/comedi/drivers/ii_pci20kc.c8
-rw-r--r--drivers/staging/comedi/drivers/jr3_pci.c8
-rw-r--r--drivers/staging/comedi/drivers/ke_counter.c16
-rw-r--r--drivers/staging/comedi/drivers/mpc624.c8
-rw-r--r--drivers/staging/comedi/drivers/mpc8260cpm.c8
-rw-r--r--drivers/staging/comedi/drivers/multiq3.c8
-rw-r--r--drivers/staging/comedi/drivers/ni_6527.c16
-rw-r--r--drivers/staging/comedi/drivers/ni_65xx.c186
-rw-r--r--drivers/staging/comedi/drivers/ni_660x.c32
-rw-r--r--drivers/staging/comedi/drivers/ni_670x.c32
-rw-r--r--drivers/staging/comedi/drivers/ni_at_a2150.c24
-rw-r--r--drivers/staging/comedi/drivers/ni_at_ao.c22
-rw-r--r--drivers/staging/comedi/drivers/ni_atmio.c262
-rw-r--r--drivers/staging/comedi/drivers/ni_atmio16d.c22
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c30
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_dio24.c30
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c82
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_cs.c44
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_cs.c198
-rw-r--r--drivers/staging/comedi/drivers/ni_pcidio.c90
-rw-r--r--drivers/staging/comedi/drivers/ni_pcimio.c12
-rw-r--r--drivers/staging/comedi/drivers/pcl711.c14
-rw-r--r--drivers/staging/comedi/drivers/pcl724.c14
-rw-r--r--drivers/staging/comedi/drivers/pcl725.c8
-rw-r--r--drivers/staging/comedi/drivers/pcl726.c14
-rw-r--r--drivers/staging/comedi/drivers/pcl730.c14
-rw-r--r--drivers/staging/comedi/drivers/pcl812.c14
-rw-r--r--drivers/staging/comedi/drivers/pcl816.c14
-rw-r--r--drivers/staging/comedi/drivers/pcl818.c14
-rw-r--r--drivers/staging/comedi/drivers/pcm3724.c14
-rw-r--r--drivers/staging/comedi/drivers/pcm3730.c8
-rw-r--r--drivers/staging/comedi/drivers/pcmad.c22
-rw-r--r--drivers/staging/comedi/drivers/pcmda12.c16
-rw-r--r--drivers/staging/comedi/drivers/pcmmio.c40
-rw-r--r--drivers/staging/comedi/drivers/pcmuio.c26
-rw-r--r--drivers/staging/comedi/drivers/poc.c60
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c12
-rw-r--r--drivers/staging/comedi/drivers/rti800.c14
-rw-r--r--drivers/staging/comedi/drivers/rti802.c8
-rw-r--r--drivers/staging/comedi/drivers/s526.c30
-rw-r--r--drivers/staging/comedi/drivers/serial2002.c16
-rw-r--r--drivers/staging/comedi/drivers/skel.c30
-rw-r--r--drivers/staging/comedi/drivers/ssv_dnp.c22
-rw-r--r--drivers/staging/comedi/drivers/unioxx5.c8
91 files changed, 2674 insertions, 2674 deletions
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index e8206a18dee..2e181f01d39 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -108,10 +108,10 @@ struct subdev_8255_struct {
108static int dev_8255_attach(struct comedi_device *dev, struct comedi_devconfig * it); 108static int dev_8255_attach(struct comedi_device *dev, struct comedi_devconfig * it);
109static int dev_8255_detach(struct comedi_device *dev); 109static int dev_8255_detach(struct comedi_device *dev);
110static struct comedi_driver driver_8255 = { 110static struct comedi_driver driver_8255 = {
111 driver_name:"8255", 111 .driver_name = "8255",
112 module:THIS_MODULE, 112 .module = THIS_MODULE,
113 attach:dev_8255_attach, 113 .attach = dev_8255_attach,
114 detach:dev_8255_detach, 114 .detach = dev_8255_detach,
115}; 115};
116 116
117COMEDI_INITCLEANUP(driver_8255); 117COMEDI_INITCLEANUP(driver_8255);
diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c
index 067ad7523d9..5b986aa7398 100644
--- a/drivers/staging/comedi/drivers/acl7225b.c
+++ b/drivers/staging/comedi/drivers/acl7225b.c
@@ -39,13 +39,13 @@ static const struct boardtype boardtypes[] = {
39#define this_board ((const struct boardtype *)dev->board_ptr) 39#define this_board ((const struct boardtype *)dev->board_ptr)
40 40
41static struct comedi_driver driver_acl7225b = { 41static struct comedi_driver driver_acl7225b = {
42 driver_name:"acl7225b", 42 .driver_name = "acl7225b",
43 module:THIS_MODULE, 43 .module = THIS_MODULE,
44 attach:acl7225b_attach, 44 .attach = acl7225b_attach,
45 detach:acl7225b_detach, 45 .detach = acl7225b_detach,
46 board_name:&boardtypes[0].name, 46 .board_name = &boardtypes[0].name,
47 num_names:n_boardtypes, 47 .num_names = n_boardtypes,
48 offset:sizeof(struct boardtype), 48 .offset = sizeof(struct boardtype),
49}; 49};
50 50
51COMEDI_INITCLEANUP(driver_acl7225b); 51COMEDI_INITCLEANUP(driver_acl7225b);
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index a6c3530674d..58d7bf1654c 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -901,7 +901,7 @@ static const struct addi_board boardtypes[] = {
901 NULL}, 901 NULL},
902#endif 902#endif
903#ifdef CONFIG_APCI_3300 903#ifdef CONFIG_APCI_3300
904 /* Begin JK 20.10.2004: APCI-3300 integration */ 904 /* Begin JK .20.10.2004 = APCI-3300 integration */
905 {"apci3300", 905 {"apci3300",
906 APCI3200_BOARD_VENDOR_ID, 906 APCI3200_BOARD_VENDOR_ID,
907 0x3007, 907 0x3007,
@@ -2528,13 +2528,13 @@ static const struct addi_board boardtypes[] = {
2528#define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board)) 2528#define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board))
2529 2529
2530struct comedi_driver driver_addi = { 2530struct comedi_driver driver_addi = {
2531 driver_name:"addi_common", 2531 .driver_name = "addi_common",
2532 module:THIS_MODULE, 2532 .module = THIS_MODULE,
2533 attach:i_ADDI_Attach, 2533 .attach = i_ADDI_Attach,
2534 detach:i_ADDI_Detach, 2534 .detach = i_ADDI_Detach,
2535 num_names:n_boardtypes, 2535 .num_names = n_boardtypes,
2536 board_name:&boardtypes[0].pc_DriverName, 2536 .board_name = &boardtypes[0].pc_DriverName,
2537 offset:sizeof(struct addi_board), 2537 .offset = sizeof(struct addi_board),
2538}; 2538};
2539 2539
2540COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); 2540COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index ad96114e359..7cd6043ed49 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -66,22 +66,22 @@ struct pci6208_board {
66 66
67static const struct pci6208_board pci6208_boards[] = { 67static const struct pci6208_board pci6208_boards[] = {
68 /*{ 68 /*{
69 name : "pci6208v", 69 .name = "pci6208v",
70 dev_id : 0x6208, // not sure 70 .dev_id = 0x6208, // not sure
71 ao_chans: 8 71 .ao_chans = 8
72 // , ao_bits : 16 72 // , .ao_bits = 16
73 }, 73 },
74 { 74 {
75 name : "pci6216v", 75 .name = "pci6216v",
76 dev_id : 0x6208, // not sure 76 .dev_id = 0x6208, // not sure
77 ao_chans: 16 77 .ao_chans = 16
78 // , ao_bits : 16 78 // , .ao_bits = 16
79 }, */ 79 }, */
80 { 80 {
81 name: "pci6208a", 81 .name = "pci6208a",
82 dev_id: 0x6208, 82 .dev_id = 0x6208,
83 ao_chans:8 83 .ao_chans = 8
84 /* , ao_bits : 16 */ 84 /* , .ao_bits = 16 */
85 } 85 }
86}; 86};
87 87
@@ -114,10 +114,10 @@ static int pci6208_detach(struct comedi_device *dev);
114 (sizeof(pci6208_boards) / sizeof(struct pci6208_board)) 114 (sizeof(pci6208_boards) / sizeof(struct pci6208_board))
115 115
116static struct comedi_driver driver_pci6208 = { 116static struct comedi_driver driver_pci6208 = {
117 driver_name:PCI6208_DRIVER_NAME, 117 .driver_name = PCI6208_DRIVER_NAME,
118 module:THIS_MODULE, 118 .module = THIS_MODULE,
119 attach:pci6208_attach, 119 .attach = pci6208_attach,
120 detach:pci6208_detach, 120 .detach = pci6208_detach,
121}; 121};
122 122
123COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table); 123COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table);
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index 72b3f4614d0..d2f23a88608 100644
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -67,10 +67,10 @@ struct adl_pci7296_private {
67static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it); 67static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it);
68static int adl_pci7296_detach(struct comedi_device *dev); 68static int adl_pci7296_detach(struct comedi_device *dev);
69static struct comedi_driver driver_adl_pci7296 = { 69static struct comedi_driver driver_adl_pci7296 = {
70 driver_name:"adl_pci7296", 70 .driver_name = "adl_pci7296",
71 module:THIS_MODULE, 71 .module = THIS_MODULE,
72 attach:adl_pci7296_attach, 72 .attach = adl_pci7296_attach,
73 detach:adl_pci7296_detach, 73 .detach = adl_pci7296_detach,
74}; 74};
75 75
76static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it) 76static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it)
diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c
index e20ec2f9904..78becbdd17a 100644
--- a/drivers/staging/comedi/drivers/adl_pci7432.c
+++ b/drivers/staging/comedi/drivers/adl_pci7432.c
@@ -61,10 +61,10 @@ struct adl_pci7432_private {
61static int adl_pci7432_attach(struct comedi_device *dev, struct comedi_devconfig *it); 61static int adl_pci7432_attach(struct comedi_device *dev, struct comedi_devconfig *it);
62static int adl_pci7432_detach(struct comedi_device *dev); 62static int adl_pci7432_detach(struct comedi_device *dev);
63static struct comedi_driver driver_adl_pci7432 = { 63static struct comedi_driver driver_adl_pci7432 = {
64 driver_name:"adl_pci7432", 64 .driver_name = "adl_pci7432",
65 module:THIS_MODULE, 65 .module = THIS_MODULE,
66 attach:adl_pci7432_attach, 66 .attach = adl_pci7432_attach,
67 detach:adl_pci7432_detach, 67 .detach = adl_pci7432_detach,
68}; 68};
69 69
70/* Digital IO */ 70/* Digital IO */
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 61b8cba40d0..2fe577a973a 100644
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -73,10 +73,10 @@ struct adl_pci8164_private {
73static int adl_pci8164_attach(struct comedi_device *dev, struct comedi_devconfig *it); 73static int adl_pci8164_attach(struct comedi_device *dev, struct comedi_devconfig *it);
74static int adl_pci8164_detach(struct comedi_device *dev); 74static int adl_pci8164_detach(struct comedi_device *dev);
75static struct comedi_driver driver_adl_pci8164 = { 75static struct comedi_driver driver_adl_pci8164 = {
76 driver_name:"adl_pci8164", 76 .driver_name = "adl_pci8164",
77 module:THIS_MODULE, 77 .module = THIS_MODULE,
78 attach:adl_pci8164_attach, 78 .attach = adl_pci8164_attach,
79 detach:adl_pci8164_detach, 79 .detach = adl_pci8164_detach,
80}; 80};
81 81
82static int adl_pci8164_insn_read_msts(struct comedi_device *dev, struct comedi_subdevice *s, 82static int adl_pci8164_insn_read_msts(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index 6dc9435997c..288ad8151dd 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -309,27 +309,27 @@ struct pci9111_board {
309 309
310static const struct pci9111_board pci9111_boards[] = { 310static const struct pci9111_board pci9111_boards[] = {
311 { 311 {
312 name: "pci9111_hr", 312 .name = "pci9111_hr",
313 device_id:PCI9111_HR_DEVICE_ID, 313 .device_id = PCI9111_HR_DEVICE_ID,
314 ai_channel_nbr:PCI9111_AI_CHANNEL_NBR, 314 .ai_channel_nbr = PCI9111_AI_CHANNEL_NBR,
315 ao_channel_nbr:PCI9111_AO_CHANNEL_NBR, 315 .ao_channel_nbr = PCI9111_AO_CHANNEL_NBR,
316 ai_resolution:PCI9111_HR_AI_RESOLUTION, 316 .ai_resolution = PCI9111_HR_AI_RESOLUTION,
317 ai_resolution_mask:PCI9111_HR_AI_RESOLUTION_MASK, 317 .ai_resolution_mask = PCI9111_HR_AI_RESOLUTION_MASK,
318 ao_resolution:PCI9111_AO_RESOLUTION, 318 .ao_resolution = PCI9111_AO_RESOLUTION,
319 ao_resolution_mask:PCI9111_AO_RESOLUTION_MASK, 319 .ao_resolution_mask = PCI9111_AO_RESOLUTION_MASK,
320 ai_range_list:&pci9111_hr_ai_range, 320 .ai_range_list = &pci9111_hr_ai_range,
321 ao_range_list:&range_bipolar10, 321 .ao_range_list = &range_bipolar10,
322 ai_acquisition_period_min_ns:PCI9111_AI_ACQUISITION_PERIOD_MIN_NS} 322 .ai_acquisition_period_min_ns = PCI9111_AI_ACQUISITION_PERIOD_MIN_NS}
323}; 323};
324 324
325#define pci9111_board_nbr \ 325#define pci9111_board_nbr \
326 (sizeof(pci9111_boards)/sizeof(struct pci9111_board)) 326 (sizeof(pci9111_boards)/sizeof(struct pci9111_board))
327 327
328static struct comedi_driver pci9111_driver = { 328static struct comedi_driver pci9111_driver = {
329 driver_name:PCI9111_DRIVER_NAME, 329 .driver_name = PCI9111_DRIVER_NAME,
330 module:THIS_MODULE, 330 .module = THIS_MODULE,
331 attach:pci9111_attach, 331 .attach = pci9111_attach,
332 detach:pci9111_detach, 332 .detach = pci9111_detach,
333}; 333};
334 334
335COMEDI_PCI_INITCLEANUP(pci9111_driver, pci9111_pci_table); 335COMEDI_PCI_INITCLEANUP(pci9111_driver, pci9111_pci_table);
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index a1e669cf4cc..59b6498ded6 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -231,13 +231,13 @@ static const struct boardtype boardtypes[] = {
231#define n_boardtypes (sizeof(boardtypes)/sizeof(struct boardtype)) 231#define n_boardtypes (sizeof(boardtypes)/sizeof(struct boardtype))
232 232
233static struct comedi_driver driver_pci9118 = { 233static struct comedi_driver driver_pci9118 = {
234 driver_name:"adl_pci9118", 234 .driver_name = "adl_pci9118",
235 module:THIS_MODULE, 235 .module = THIS_MODULE,
236 attach:pci9118_attach, 236 .attach = pci9118_attach,
237 detach:pci9118_detach, 237 .detach = pci9118_detach,
238 num_names:n_boardtypes, 238 .num_names = n_boardtypes,
239 board_name:&boardtypes[0].name, 239 .board_name = &boardtypes[0].name,
240 offset:sizeof(struct boardtype), 240 .offset = sizeof(struct boardtype),
241}; 241};
242 242
243COMEDI_PCI_INITCLEANUP(driver_pci9118, pci9118_pci_table); 243COMEDI_PCI_INITCLEANUP(driver_pci9118, pci9118_pci_table);
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c
index 8fe4c0b0e8f..9921702bf39 100644
--- a/drivers/staging/comedi/drivers/adq12b.c
+++ b/drivers/staging/comedi/drivers/adq12b.c
@@ -127,20 +127,20 @@ struct adq12b_board {
127 127
128static const struct adq12b_board adq12b_boards[] = { 128static const struct adq12b_board adq12b_boards[] = {
129 { 129 {
130 name: "adq12b", 130 .name = "adq12b",
131 ai_se_chans: 16, 131 .ai_se_chans = 16,
132 ai_diff_chans: 8, 132 .ai_diff_chans = 8,
133 ai_bits: 12, 133 .ai_bits = 12,
134 di_chans: 5, 134 .di_chans = 5,
135 do_chans: 8 135 .do_chans = 8
136 } 136 }
137// potentially, more adq-based deviced will be added 137// potentially, more adq-based deviced will be added
138/*, 138/*,
139 name: "adq12b", 139 .name = "adq12b",
140 ai_chans: 16, // this is just for reference, hardcoded again later 140 .ai_chans = 16, // this is just for reference, hardcoded again later
141 ai_bits: 12, 141 .ai_bits = 12,
142 di_chans: 8, 142 .di_chans = 8,
143 do_chans: 5 143 .do_chans = 5
144 }*/ 144 }*/
145}; 145};
146 146
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 38be3f8be07..c617ec39dab 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -116,15 +116,15 @@ struct pci1723_board {
116 116
117static const struct pci1723_board boardtypes[] = { 117static const struct pci1723_board boardtypes[] = {
118 { 118 {
119 name: "pci1723", 119 .name = "pci1723",
120 vendor_id:ADVANTECH_VENDOR, 120 .vendor_id = ADVANTECH_VENDOR,
121 device_id:0x1723, 121 .device_id = 0x1723,
122 iorange: IORANGE_1723, 122 .iorange = IORANGE_1723,
123 cardtype:TYPE_PCI1723, 123 .cardtype = TYPE_PCI1723,
124 n_aochan:8, 124 .n_aochan = 8,
125 n_diochan:16, 125 .n_diochan = 16,
126 ao_maxdata:0xffff, 126 .ao_maxdata = 0xffff,
127 rangelist_ao:&range_pci1723, 127 .rangelist_ao = &range_pci1723,
128 }, 128 },
129}; 129};
130 130
@@ -149,10 +149,10 @@ static int pci1723_detach(struct comedi_device *dev);
149#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pci1723_board)) 149#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pci1723_board))
150 150
151static struct comedi_driver driver_pci1723 = { 151static struct comedi_driver driver_pci1723 = {
152 driver_name:"adv_pci1723", 152 .driver_name = "adv_pci1723",
153 module:THIS_MODULE, 153 .module = THIS_MODULE,
154 attach:pci1723_attach, 154 .attach = pci1723_attach,
155 detach:pci1723_detach, 155 .detach = pci1723_detach,
156}; 156};
157 157
158/* this structure is for data unique to this hardware driver. */ 158/* this structure is for data unique to this hardware driver. */
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index afa2a4d3816..7d66f2ba6b7 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -323,10 +323,10 @@ static const struct dio_boardtype boardtypes[] = {
323#define n_boardtypes (sizeof(boardtypes)/sizeof(struct dio_boardtype)) 323#define n_boardtypes (sizeof(boardtypes)/sizeof(struct dio_boardtype))
324 324
325static struct comedi_driver driver_pci_dio = { 325static struct comedi_driver driver_pci_dio = {
326 driver_name:"adv_pci_dio", 326 .driver_name = "adv_pci_dio",
327 module:THIS_MODULE, 327 .module = THIS_MODULE,
328 attach:pci_dio_attach, 328 .attach = pci_dio_attach,
329 detach:pci_dio_detach 329 .detach = pci_dio_detach
330}; 330};
331 331
332struct pci_dio_private { 332struct pci_dio_private {
diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c
index ce4e8e49ae8..e77d3379749 100644
--- a/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -77,7 +77,7 @@ struct aio12_8_boardtype {
77 77
78static const struct aio12_8_boardtype board_types[] = { 78static const struct aio12_8_boardtype board_types[] = {
79 { 79 {
80 name: "aio_aio12_8"}, 80 .name = "aio_aio12_8"},
81}; 81};
82 82
83#define thisboard ((const struct aio12_8_boardtype *) dev->board_ptr) 83#define thisboard ((const struct aio12_8_boardtype *) dev->board_ptr)
@@ -214,13 +214,13 @@ static int aio_aio12_8_detach(struct comedi_device *dev)
214} 214}
215 215
216static struct comedi_driver driver_aio_aio12_8 = { 216static struct comedi_driver driver_aio_aio12_8 = {
217 driver_name:"aio_aio12_8", 217 .driver_name = "aio_aio12_8",
218 module:THIS_MODULE, 218 .module = THIS_MODULE,
219 attach:aio_aio12_8_attach, 219 .attach = aio_aio12_8_attach,
220 detach:aio_aio12_8_detach, 220 .detach = aio_aio12_8_detach,
221 board_name:&board_types[0].name, 221 .board_name = &board_types[0].name,
222 num_names:1, 222 .num_names = 1,
223 offset:sizeof(struct aio12_8_boardtype), 223 .offset = sizeof(struct aio12_8_boardtype),
224}; 224};
225 225
226COMEDI_INITCLEANUP(driver_aio_aio12_8); 226COMEDI_INITCLEANUP(driver_aio_aio12_8);
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c
index 8374f65a8be..764cac2fd7d 100644
--- a/drivers/staging/comedi/drivers/aio_iiro_16.c
+++ b/drivers/staging/comedi/drivers/aio_iiro_16.c
@@ -52,9 +52,9 @@ struct aio_iiro_16_board {
52 52
53static const struct aio_iiro_16_board aio_iiro_16_boards[] = { 53static const struct aio_iiro_16_board aio_iiro_16_boards[] = {
54 { 54 {
55 name: "aio_iiro_16", 55 .name = "aio_iiro_16",
56 di: 16, 56 .di = 16,
57 do_: 16}, 57 .do_ = 16},
58}; 58};
59 59
60#define thisboard ((const struct aio_iiro_16_board *) dev->board_ptr) 60#define thisboard ((const struct aio_iiro_16_board *) dev->board_ptr)
@@ -72,13 +72,13 @@ static int aio_iiro_16_attach(struct comedi_device *dev, struct comedi_devconfig
72static int aio_iiro_16_detach(struct comedi_device *dev); 72static int aio_iiro_16_detach(struct comedi_device *dev);
73 73
74static struct comedi_driver driver_aio_iiro_16 = { 74static struct comedi_driver driver_aio_iiro_16 = {
75 driver_name:"aio_iiro_16", 75 .driver_name = "aio_iiro_16",
76 module:THIS_MODULE, 76 .module = THIS_MODULE,
77 attach:aio_iiro_16_attach, 77 .attach = aio_iiro_16_attach,
78 detach:aio_iiro_16_detach, 78 .detach = aio_iiro_16_detach,
79 board_name:&aio_iiro_16_boards[0].name, 79 .board_name = &aio_iiro_16_boards[0].name,
80 offset:sizeof(struct aio_iiro_16_board), 80 .offset = sizeof(struct aio_iiro_16_board),
81 num_names:sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board), 81 .num_names = sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board),
82}; 82};
83 83
84static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev, 84static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 7c323e24283..582d6a2cfef 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -290,59 +290,59 @@ struct dio200_board {
290 290
291static const struct dio200_board dio200_boards[] = { 291static const struct dio200_board dio200_boards[] = {
292 { 292 {
293 name: "pc212e", 293 .name = "pc212e",
294 bustype: isa_bustype, 294 .bustype = isa_bustype,
295 model: pc212e_model, 295 .model = pc212e_model,
296 layout: pc212_layout, 296 .layout = pc212_layout,
297 }, 297 },
298 { 298 {
299 name: "pc214e", 299 .name = "pc214e",
300 bustype: isa_bustype, 300 .bustype = isa_bustype,
301 model: pc214e_model, 301 .model = pc214e_model,
302 layout: pc214_layout, 302 .layout = pc214_layout,
303 }, 303 },
304 { 304 {
305 name: "pc215e", 305 .name = "pc215e",
306 bustype: isa_bustype, 306 .bustype = isa_bustype,
307 model: pc215e_model, 307 .model = pc215e_model,
308 layout: pc215_layout, 308 .layout = pc215_layout,
309 }, 309 },
310#ifdef CONFIG_COMEDI_PCI 310#ifdef CONFIG_COMEDI_PCI
311 { 311 {
312 name: "pci215", 312 .name = "pci215",
313 devid: PCI_DEVICE_ID_AMPLICON_PCI215, 313 .devid = PCI_DEVICE_ID_AMPLICON_PCI215,
314 bustype: pci_bustype, 314 .bustype = pci_bustype,
315 model: pci215_model, 315 .model = pci215_model,
316 layout: pc215_layout, 316 .layout = pc215_layout,
317 }, 317 },
318#endif 318#endif
319 { 319 {
320 name: "pc218e", 320 .name = "pc218e",
321 bustype: isa_bustype, 321 .bustype = isa_bustype,
322 model: pc218e_model, 322 .model = pc218e_model,
323 layout: pc218_layout, 323 .layout = pc218_layout,
324 }, 324 },
325 { 325 {
326 name: "pc272e", 326 .name = "pc272e",
327 bustype: isa_bustype, 327 .bustype = isa_bustype,
328 model: pc272e_model, 328 .model = pc272e_model,
329 layout: pc272_layout, 329 .layout = pc272_layout,
330 }, 330 },
331#ifdef CONFIG_COMEDI_PCI 331#ifdef CONFIG_COMEDI_PCI
332 { 332 {
333 name: "pci272", 333 .name = "pci272",
334 devid: PCI_DEVICE_ID_AMPLICON_PCI272, 334 .devid = PCI_DEVICE_ID_AMPLICON_PCI272,
335 bustype: pci_bustype, 335 .bustype = pci_bustype,
336 model: pci272_model, 336 .model = pci272_model,
337 layout: pc272_layout, 337 .layout = pc272_layout,
338 }, 338 },
339#endif 339#endif
340#ifdef CONFIG_COMEDI_PCI 340#ifdef CONFIG_COMEDI_PCI
341 { 341 {
342 name: DIO200_DRIVER_NAME, 342 .name = DIO200_DRIVER_NAME,
343 devid: PCI_DEVICE_ID_INVALID, 343 .devid = PCI_DEVICE_ID_INVALID,
344 bustype: pci_bustype, 344 .bustype = pci_bustype,
345 model: anypci_model, /* wildcard */ 345 .model = anypci_model, /* wildcard */
346 }, 346 },
347#endif 347#endif
348}; 348};
@@ -367,50 +367,50 @@ struct dio200_layout_struct {
367 367
368static const struct dio200_layout_struct dio200_layouts[] = { 368static const struct dio200_layout_struct dio200_layouts[] = {
369 [pc212_layout] = { 369 [pc212_layout] = {
370 n_subdevs:6, 370 .n_subdevs = 6,
371 sdtype: {sd_8255, sd_8254, sd_8254, sd_8254, 371 .sdtype = {sd_8255, sd_8254, sd_8254, sd_8254,
372 sd_8254, 372 sd_8254,
373 sd_intr}, 373 sd_intr},
374 sdinfo: {0x00, 0x08, 0x0C, 0x10, 0x14, 374 .sdinfo = {0x00, 0x08, 0x0C, 0x10, 0x14,
375 0x3F}, 375 0x3F},
376 has_int_sce:1, 376 .has_int_sce = 1,
377 has_clk_gat_sce:1, 377 .has_clk_gat_sce = 1,
378 }, 378 },
379 [pc214_layout] = { 379 [pc214_layout] = {
380 n_subdevs:4, 380 .n_subdevs = 4,
381 sdtype: {sd_8255, sd_8255, sd_8254, 381 .sdtype = {sd_8255, sd_8255, sd_8254,
382 sd_intr}, 382 sd_intr},
383 sdinfo: {0x00, 0x08, 0x10, 0x01}, 383 .sdinfo = {0x00, 0x08, 0x10, 0x01},
384 has_int_sce:0, 384 .has_int_sce = 0,
385 has_clk_gat_sce:0, 385 .has_clk_gat_sce = 0,
386 }, 386 },
387 [pc215_layout] = { 387 [pc215_layout] = {
388 n_subdevs:5, 388 .n_subdevs = 5,
389 sdtype: {sd_8255, sd_8255, sd_8254, 389 .sdtype = {sd_8255, sd_8255, sd_8254,
390 sd_8254, 390 sd_8254,
391 sd_intr}, 391 sd_intr},
392 sdinfo: {0x00, 0x08, 0x10, 0x14, 0x3F}, 392 .sdinfo = {0x00, 0x08, 0x10, 0x14, 0x3F},
393 has_int_sce:1, 393 .has_int_sce = 1,
394 has_clk_gat_sce:1, 394 .has_clk_gat_sce = 1,
395 }, 395 },
396 [pc218_layout] = { 396 [pc218_layout] = {
397 n_subdevs:7, 397 .n_subdevs = 7,
398 sdtype: {sd_8254, sd_8254, sd_8255, sd_8254, 398 .sdtype = {sd_8254, sd_8254, sd_8255, sd_8254,
399 sd_8254, 399 sd_8254,
400 sd_intr}, 400 sd_intr},
401 sdinfo: {0x00, 0x04, 0x08, 0x0C, 0x10, 401 .sdinfo = {0x00, 0x04, 0x08, 0x0C, 0x10,
402 0x14, 402 0x14,
403 0x3F}, 403 0x3F},
404 has_int_sce:1, 404 .has_int_sce = 1,
405 has_clk_gat_sce:1, 405 .has_clk_gat_sce = 1,
406 }, 406 },
407 [pc272_layout] = { 407 [pc272_layout] = {
408 n_subdevs:4, 408 .n_subdevs = 4,
409 sdtype: {sd_8255, sd_8255, sd_8255, 409 .sdtype = {sd_8255, sd_8255, sd_8255,
410 sd_intr}, 410 sd_intr},
411 sdinfo: {0x00, 0x08, 0x10, 0x3F}, 411 .sdinfo = {0x00, 0x08, 0x10, 0x3F},
412 has_int_sce:1, 412 .has_int_sce = 1,
413 has_clk_gat_sce:0, 413 .has_clk_gat_sce = 0,
414 }, 414 },
415}; 415};
416 416
@@ -478,13 +478,13 @@ struct dio200_subdev_intr {
478static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it); 478static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it);
479static int dio200_detach(struct comedi_device *dev); 479static int dio200_detach(struct comedi_device *dev);
480static struct comedi_driver driver_amplc_dio200 = { 480static struct comedi_driver driver_amplc_dio200 = {
481 driver_name:DIO200_DRIVER_NAME, 481 .driver_name = DIO200_DRIVER_NAME,
482 module:THIS_MODULE, 482 .module = THIS_MODULE,
483 attach:dio200_attach, 483 .attach = dio200_attach,
484 detach:dio200_detach, 484 .detach = dio200_detach,
485 board_name:&dio200_boards[0].name, 485 .board_name = &dio200_boards[0].name,
486 offset:sizeof(struct dio200_board), 486 .offset = sizeof(struct dio200_board),
487 num_names:sizeof(dio200_boards) / sizeof(struct dio200_board), 487 .num_names = sizeof(dio200_boards) / sizeof(struct dio200_board),
488}; 488};
489 489
490#ifdef CONFIG_COMEDI_PCI 490#ifdef CONFIG_COMEDI_PCI
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 8454f6d6517..57e57c670ec 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -107,27 +107,27 @@ struct pc236_board {
107}; 107};
108static const struct pc236_board pc236_boards[] = { 108static const struct pc236_board pc236_boards[] = {
109 { 109 {
110 name: "pc36at", 110 .name = "pc36at",
111 fancy_name:"PC36AT", 111 .fancy_name = "PC36AT",
112 bustype: isa_bustype, 112 .bustype = isa_bustype,
113 model: pc36at_model, 113 .model = pc36at_model,
114 }, 114 },
115#ifdef CONFIG_COMEDI_PCI 115#ifdef CONFIG_COMEDI_PCI
116 { 116 {
117 name: "pci236", 117 .name = "pci236",
118 fancy_name:"PCI236", 118 .fancy_name = "PCI236",
119 devid: PCI_DEVICE_ID_AMPLICON_PCI236, 119 .devid = PCI_DEVICE_ID_AMPLICON_PCI236,
120 bustype: pci_bustype, 120 .bustype = pci_bustype,
121 model: pci236_model, 121 .model = pci236_model,
122 }, 122 },
123#endif 123#endif
124#ifdef CONFIG_COMEDI_PCI 124#ifdef CONFIG_COMEDI_PCI
125 { 125 {
126 name: PC236_DRIVER_NAME, 126 .name = PC236_DRIVER_NAME,
127 fancy_name:PC236_DRIVER_NAME, 127 .fancy_name = PC236_DRIVER_NAME,
128 devid: PCI_DEVICE_ID_INVALID, 128 .devid = PCI_DEVICE_ID_INVALID,
129 bustype: pci_bustype, 129 .bustype = pci_bustype,
130 model: anypci_model, /* wildcard */ 130 .model = anypci_model, /* wildcard */
131 }, 131 },
132#endif 132#endif
133}; 133};
@@ -170,13 +170,13 @@ struct pc236_private {
170static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it); 170static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it);
171static int pc236_detach(struct comedi_device *dev); 171static int pc236_detach(struct comedi_device *dev);
172static struct comedi_driver driver_amplc_pc236 = { 172static struct comedi_driver driver_amplc_pc236 = {
173 driver_name:PC236_DRIVER_NAME, 173 .driver_name = PC236_DRIVER_NAME,
174 module:THIS_MODULE, 174 .module = THIS_MODULE,
175 attach:pc236_attach, 175 .attach = pc236_attach,
176 detach:pc236_detach, 176 .detach = pc236_detach,
177 board_name:&pc236_boards[0].name, 177 .board_name = &pc236_boards[0].name,
178 offset:sizeof(struct pc236_board), 178 .offset = sizeof(struct pc236_board),
179 num_names:sizeof(pc236_boards) / sizeof(struct pc236_board), 179 .num_names = sizeof(pc236_boards) / sizeof(struct pc236_board),
180}; 180};
181 181
182#ifdef CONFIG_COMEDI_PCI 182#ifdef CONFIG_COMEDI_PCI
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index 8a94360fe2d..1d516b1f159 100644
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -74,27 +74,27 @@ struct pc263_board {
74}; 74};
75static const struct pc263_board pc263_boards[] = { 75static const struct pc263_board pc263_boards[] = {
76 { 76 {
77 name: "pc263", 77 .name = "pc263",
78 fancy_name:"PC263", 78 .fancy_name = "PC263",
79 bustype: isa_bustype, 79 .bustype = isa_bustype,
80 model: pc263_model, 80 .model = pc263_model,
81 }, 81 },
82#ifdef CONFIG_COMEDI_PCI 82#ifdef CONFIG_COMEDI_PCI
83 { 83 {
84 name: "pci263", 84 .name = "pci263",
85 fancy_name:"PCI263", 85 .fancy_name = "PCI263",
86 devid: PCI_DEVICE_ID_AMPLICON_PCI263, 86 .devid = PCI_DEVICE_ID_AMPLICON_PCI263,
87 bustype: pci_bustype, 87 .bustype = pci_bustype,
88 model: pci263_model, 88 .model = pci263_model,
89 }, 89 },
90#endif 90#endif
91#ifdef CONFIG_COMEDI_PCI 91#ifdef CONFIG_COMEDI_PCI
92 { 92 {
93 name: PC263_DRIVER_NAME, 93 .name = PC263_DRIVER_NAME,
94 fancy_name:PC263_DRIVER_NAME, 94 .fancy_name = PC263_DRIVER_NAME,
95 devid: PCI_DEVICE_ID_INVALID, 95 .devid = PCI_DEVICE_ID_INVALID,
96 bustype: pci_bustype, 96 .bustype = pci_bustype,
97 model: anypci_model, /* wildcard */ 97 .model = anypci_model, /* wildcard */
98 }, 98 },
99#endif 99#endif
100}; 100};
@@ -135,13 +135,13 @@ struct pc263_private {
135static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it); 135static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it);
136static int pc263_detach(struct comedi_device *dev); 136static int pc263_detach(struct comedi_device *dev);
137static struct comedi_driver driver_amplc_pc263 = { 137static struct comedi_driver driver_amplc_pc263 = {
138 driver_name:PC263_DRIVER_NAME, 138 .driver_name = PC263_DRIVER_NAME,
139 module:THIS_MODULE, 139 .module = THIS_MODULE,
140 attach:pc263_attach, 140 .attach = pc263_attach,
141 detach:pc263_detach, 141 .detach = pc263_detach,
142 board_name:&pc263_boards[0].name, 142 .board_name = &pc263_boards[0].name,
143 offset:sizeof(struct pc263_board), 143 .offset = sizeof(struct pc263_board),
144 num_names:sizeof(pc263_boards) / sizeof(struct pc263_board), 144 .num_names = sizeof(pc263_boards) / sizeof(struct pc263_board),
145}; 145};
146 146
147static int pc263_request_region(unsigned minor, unsigned long from, 147static int pc263_request_region(unsigned minor, unsigned long from,
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 7cc594b3807..19e4428c338 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -358,23 +358,23 @@ struct pci224_board {
358 358
359static const struct pci224_board pci224_boards[] = { 359static const struct pci224_board pci224_boards[] = {
360 { 360 {
361 name: "pci224", 361 .name = "pci224",
362 devid: PCI_DEVICE_ID_AMPLICON_PCI224, 362 .devid = PCI_DEVICE_ID_AMPLICON_PCI224,
363 model: pci224_model, 363 .model = pci224_model,
364 ao_chans:16, 364 .ao_chans = 16,
365 ao_bits: 12, 365 .ao_bits = 12,
366 }, 366 },
367 { 367 {
368 name: "pci234", 368 .name = "pci234",
369 devid: PCI_DEVICE_ID_AMPLICON_PCI234, 369 .devid = PCI_DEVICE_ID_AMPLICON_PCI234,
370 model: pci234_model, 370 .model = pci234_model,
371 ao_chans:4, 371 .ao_chans = 4,
372 ao_bits: 16, 372 .ao_bits = 16,
373 }, 373 },
374 { 374 {
375 name: DRIVER_NAME, 375 .name = DRIVER_NAME,
376 devid: PCI_DEVICE_ID_INVALID, 376 .devid = PCI_DEVICE_ID_INVALID,
377 model: any_model, /* wildcard */ 377 .model = any_model, /* wildcard */
378 }, 378 },
379}; 379};
380 380
@@ -431,13 +431,13 @@ struct pci224_private {
431static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it); 431static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it);
432static int pci224_detach(struct comedi_device *dev); 432static int pci224_detach(struct comedi_device *dev);
433static struct comedi_driver driver_amplc_pci224 = { 433static struct comedi_driver driver_amplc_pci224 = {
434 driver_name:DRIVER_NAME, 434 .driver_name = DRIVER_NAME,
435 module:THIS_MODULE, 435 .module = THIS_MODULE,
436 attach:pci224_attach, 436 .attach = pci224_attach,
437 detach:pci224_detach, 437 .detach = pci224_detach,
438 board_name:&pci224_boards[0].name, 438 .board_name = &pci224_boards[0].name,
439 offset:sizeof(struct pci224_board), 439 .offset = sizeof(struct pci224_board),
440 num_names:sizeof(pci224_boards) / sizeof(struct pci224_board), 440 .num_names = sizeof(pci224_boards) / sizeof(struct pci224_board),
441}; 441};
442 442
443COMEDI_PCI_INITCLEANUP(driver_amplc_pci224, pci224_pci_table); 443COMEDI_PCI_INITCLEANUP(driver_amplc_pci224, pci224_pci_table);
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 570ad457fe5..94f45029a9c 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -457,46 +457,46 @@ struct pci230_board {
457}; 457};
458static const struct pci230_board pci230_boards[] = { 458static const struct pci230_board pci230_boards[] = {
459 { 459 {
460 name: "pci230+", 460 .name = "pci230+",
461 id: PCI_DEVICE_ID_PCI230, 461 .id = PCI_DEVICE_ID_PCI230,
462 ai_chans:16, 462 .ai_chans = 16,
463 ai_bits: 16, 463 .ai_bits = 16,
464 ao_chans:2, 464 .ao_chans = 2,
465 ao_bits: 12, 465 .ao_bits = 12,
466 have_dio:1, 466 .have_dio = 1,
467 min_hwver:1, 467 .min_hwver = 1,
468 }, 468 },
469 { 469 {
470 name: "pci260+", 470 .name = "pci260+",
471 id: PCI_DEVICE_ID_PCI260, 471 .id = PCI_DEVICE_ID_PCI260,
472 ai_chans:16, 472 .ai_chans = 16,
473 ai_bits: 16, 473 .ai_bits = 16,
474 ao_chans:0, 474 .ao_chans = 0,
475 ao_bits: 0, 475 .ao_bits = 0,
476 have_dio:0, 476 .have_dio = 0,
477 min_hwver:1, 477 .min_hwver = 1,
478 }, 478 },
479 { 479 {
480 name: "pci230", 480 .name = "pci230",
481 id: PCI_DEVICE_ID_PCI230, 481 .id = PCI_DEVICE_ID_PCI230,
482 ai_chans:16, 482 .ai_chans = 16,
483 ai_bits: 12, 483 .ai_bits = 12,
484 ao_chans:2, 484 .ao_chans = 2,
485 ao_bits: 12, 485 .ao_bits = 12,
486 have_dio:1, 486 .have_dio = 1,
487 }, 487 },
488 { 488 {
489 name: "pci260", 489 .name = "pci260",
490 id: PCI_DEVICE_ID_PCI260, 490 .id = PCI_DEVICE_ID_PCI260,
491 ai_chans:16, 491 .ai_chans = 16,
492 ai_bits: 12, 492 .ai_bits = 12,
493 ao_chans:0, 493 .ao_chans = 0,
494 ao_bits: 0, 494 .ao_bits = 0,
495 have_dio:0, 495 .have_dio = 0,
496 }, 496 },
497 { 497 {
498 name: "amplc_pci230", /* Wildcard matches any above */ 498 .name = "amplc_pci230", /* Wildcard matches any above */
499 id: PCI_DEVICE_ID_INVALID, 499 .id = PCI_DEVICE_ID_INVALID,
500 }, 500 },
501}; 501};
502 502
@@ -606,13 +606,13 @@ static const unsigned char pci230_ao_bipolar[2] = { 0, 1 };
606static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it); 606static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it);
607static int pci230_detach(struct comedi_device *dev); 607static int pci230_detach(struct comedi_device *dev);
608static struct comedi_driver driver_amplc_pci230 = { 608static struct comedi_driver driver_amplc_pci230 = {
609 driver_name:"amplc_pci230", 609 .driver_name = "amplc_pci230",
610 module:THIS_MODULE, 610 .module = THIS_MODULE,
611 attach:pci230_attach, 611 .attach = pci230_attach,
612 detach:pci230_detach, 612 .detach = pci230_detach,
613 board_name:&pci230_boards[0].name, 613 .board_name = &pci230_boards[0].name,
614 offset:sizeof(pci230_boards[0]), 614 .offset = sizeof(pci230_boards[0]),
615 num_names:sizeof(pci230_boards) / sizeof(pci230_boards[0]), 615 .num_names = sizeof(pci230_boards) / sizeof(pci230_boards[0]),
616}; 616};
617 617
618COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table); 618COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table);
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index 0c212ecc76c..b204793040e 100644
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -100,10 +100,10 @@ union encvaluetype {
100static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *it); 100static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *it);
101static int c6xdigio_detach(struct comedi_device *dev); 101static int c6xdigio_detach(struct comedi_device *dev);
102struct comedi_driver driver_c6xdigio = { 102struct comedi_driver driver_c6xdigio = {
103 driver_name:"c6xdigio", 103 .driver_name = "c6xdigio",
104 module:THIS_MODULE, 104 .module = THIS_MODULE,
105 attach:c6xdigio_attach, 105 .attach = c6xdigio_attach,
106 detach:c6xdigio_detach, 106 .detach = c6xdigio_detach,
107}; 107};
108 108
109static void C6X_pwmInit(unsigned long baseAddr) 109static void C6X_pwmInit(unsigned long baseAddr)
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index e476baf7c1d..3199249a8fc 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -61,19 +61,19 @@ struct das16cs_board {
61}; 61};
62static const struct das16cs_board das16cs_boards[] = { 62static const struct das16cs_board das16cs_boards[] = {
63 { 63 {
64 device_id:0x0000,/* unknown */ 64 .device_id = 0x0000,/* unknown */
65 name: "PC-CARD DAS16/16", 65 .name = "PC-CARD DAS16/16",
66 n_ao_chans:0, 66 .n_ao_chans = 0,
67 }, 67 },
68 { 68 {
69 device_id:0x0039, 69 .device_id = 0x0039,
70 name: "PC-CARD DAS16/16-AO", 70 .name = "PC-CARD DAS16/16-AO",
71 n_ao_chans:2, 71 .n_ao_chans = 2,
72 }, 72 },
73 { 73 {
74 device_id:0x4009, 74 .device_id = 0x4009,
75 name: "PCM-DAS16s/16", 75 .name = "PCM-DAS16s/16",
76 n_ao_chans:0, 76 .n_ao_chans = 0,
77 }, 77 },
78}; 78};
79 79
@@ -92,10 +92,10 @@ struct das16cs_private {
92static int das16cs_attach(struct comedi_device *dev, struct comedi_devconfig *it); 92static int das16cs_attach(struct comedi_device *dev, struct comedi_devconfig *it);
93static int das16cs_detach(struct comedi_device *dev); 93static int das16cs_detach(struct comedi_device *dev);
94static struct comedi_driver driver_das16cs = { 94static struct comedi_driver driver_das16cs = {
95 driver_name:"cb_das16_cs", 95 .driver_name = "cb_das16_cs",
96 module:THIS_MODULE, 96 .module = THIS_MODULE,
97 attach:das16cs_attach, 97 .attach = das16cs_attach,
98 detach:das16cs_detach, 98 .detach = das16cs_detach,
99}; 99};
100 100
101static struct pcmcia_device *cur_dev = NULL; 101static struct pcmcia_device *cur_dev = NULL;
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index a7b75808bda..112480c969a 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -260,118 +260,118 @@ struct cb_pcidas_board {
260 260
261static const struct cb_pcidas_board cb_pcidas_boards[] = { 261static const struct cb_pcidas_board cb_pcidas_boards[] = {
262 { 262 {
263 name: "pci-das1602/16", 263 .name = "pci-das1602/16",
264 device_id:0x1, 264 .device_id = 0x1,
265 ai_se_chans:16, 265 .ai_se_chans = 16,
266 ai_diff_chans:8, 266 .ai_diff_chans = 8,
267 ai_bits: 16, 267 .ai_bits = 16,
268 ai_speed:5000, 268 .ai_speed = 5000,
269 ao_nchan:2, 269 .ao_nchan = 2,
270 has_ao_fifo:1, 270 .has_ao_fifo = 1,
271 ao_scan_speed:10000, 271 .ao_scan_speed = 10000,
272 fifo_size:512, 272 .fifo_size = 512,
273 ranges: &cb_pcidas_ranges, 273 .ranges = &cb_pcidas_ranges,
274 trimpot: AD8402, 274 .trimpot = AD8402,
275 has_dac08:1, 275 .has_dac08 = 1,
276 }, 276 },
277 { 277 {
278 name: "pci-das1200", 278 .name = "pci-das1200",
279 device_id:0xF, 279 .device_id = 0xF,
280 ai_se_chans:16, 280 .ai_se_chans = 16,
281 ai_diff_chans:8, 281 .ai_diff_chans = 8,
282 ai_bits: 12, 282 .ai_bits = 12,
283 ai_speed:3200, 283 .ai_speed = 3200,
284 ao_nchan:2, 284 .ao_nchan = 2,
285 has_ao_fifo:0, 285 .has_ao_fifo = 0,
286 fifo_size:1024, 286 .fifo_size = 1024,
287 ranges: &cb_pcidas_ranges, 287 .ranges = &cb_pcidas_ranges,
288 trimpot: AD7376, 288 .trimpot = AD7376,
289 has_dac08:0, 289 .has_dac08 = 0,
290 }, 290 },
291 { 291 {
292 name: "pci-das1602/12", 292 .name = "pci-das1602/12",
293 device_id:0x10, 293 .device_id = 0x10,
294 ai_se_chans:16, 294 .ai_se_chans = 16,
295 ai_diff_chans:8, 295 .ai_diff_chans = 8,
296 ai_bits: 12, 296 .ai_bits = 12,
297 ai_speed:3200, 297 .ai_speed = 3200,
298 ao_nchan:2, 298 .ao_nchan = 2,
299 has_ao_fifo:1, 299 .has_ao_fifo = 1,
300 ao_scan_speed:4000, 300 .ao_scan_speed = 4000,
301 fifo_size:1024, 301 .fifo_size = 1024,
302 ranges: &cb_pcidas_ranges, 302 .ranges = &cb_pcidas_ranges,
303 trimpot: AD7376, 303 .trimpot = AD7376,
304 has_dac08:0, 304 .has_dac08 = 0,
305 }, 305 },
306 { 306 {
307 name: "pci-das1200/jr", 307 .name = "pci-das1200/jr",
308 device_id:0x19, 308 .device_id = 0x19,
309 ai_se_chans:16, 309 .ai_se_chans = 16,
310 ai_diff_chans:8, 310 .ai_diff_chans = 8,
311 ai_bits: 12, 311 .ai_bits = 12,
312 ai_speed:3200, 312 .ai_speed = 3200,
313 ao_nchan:0, 313 .ao_nchan = 0,
314 has_ao_fifo:0, 314 .has_ao_fifo = 0,
315 fifo_size:1024, 315 .fifo_size = 1024,
316 ranges: &cb_pcidas_ranges, 316 .ranges = &cb_pcidas_ranges,
317 trimpot: AD7376, 317 .trimpot = AD7376,
318 has_dac08:0, 318 .has_dac08 = 0,
319 }, 319 },
320 { 320 {
321 name: "pci-das1602/16/jr", 321 .name = "pci-das1602/16/jr",
322 device_id:0x1C, 322 .device_id = 0x1C,
323 ai_se_chans:16, 323 .ai_se_chans = 16,
324 ai_diff_chans:8, 324 .ai_diff_chans = 8,
325 ai_bits: 16, 325 .ai_bits = 16,
326 ai_speed:5000, 326 .ai_speed = 5000,
327 ao_nchan:0, 327 .ao_nchan = 0,
328 has_ao_fifo:0, 328 .has_ao_fifo = 0,
329 fifo_size:512, 329 .fifo_size = 512,
330 ranges: &cb_pcidas_ranges, 330 .ranges = &cb_pcidas_ranges,
331 trimpot: AD8402, 331 .trimpot = AD8402,
332 has_dac08:1, 332 .has_dac08 = 1,
333 }, 333 },
334 { 334 {
335 name: "pci-das1000", 335 .name = "pci-das1000",
336 device_id:0x4C, 336 .device_id = 0x4C,
337 ai_se_chans:16, 337 .ai_se_chans = 16,
338 ai_diff_chans:8, 338 .ai_diff_chans = 8,
339 ai_bits: 12, 339 .ai_bits = 12,
340 ai_speed:4000, 340 .ai_speed = 4000,
341 ao_nchan:0, 341 .ao_nchan = 0,
342 has_ao_fifo:0, 342 .has_ao_fifo = 0,
343 fifo_size:1024, 343 .fifo_size = 1024,
344 ranges: &cb_pcidas_ranges, 344 .ranges = &cb_pcidas_ranges,
345 trimpot: AD7376, 345 .trimpot = AD7376,
346 has_dac08:0, 346 .has_dac08 = 0,
347 }, 347 },
348 { 348 {
349 name: "pci-das1001", 349 .name = "pci-das1001",
350 device_id:0x1a, 350 .device_id = 0x1a,
351 ai_se_chans:16, 351 .ai_se_chans = 16,
352 ai_diff_chans:8, 352 .ai_diff_chans = 8,
353 ai_bits: 12, 353 .ai_bits = 12,
354 ai_speed:6800, 354 .ai_speed = 6800,
355 ao_nchan:2, 355 .ao_nchan = 2,
356 has_ao_fifo:0, 356 .has_ao_fifo = 0,
357 fifo_size:1024, 357 .fifo_size = 1024,
358 ranges: &cb_pcidas_alt_ranges, 358 .ranges = &cb_pcidas_alt_ranges,
359 trimpot: AD7376, 359 .trimpot = AD7376,
360 has_dac08:0, 360 .has_dac08 = 0,
361 }, 361 },
362 { 362 {
363 name: "pci-das1002", 363 .name = "pci-das1002",
364 device_id:0x1b, 364 .device_id = 0x1b,
365 ai_se_chans:16, 365 .ai_se_chans = 16,
366 ai_diff_chans:8, 366 .ai_diff_chans = 8,
367 ai_bits: 12, 367 .ai_bits = 12,
368 ai_speed:6800, 368 .ai_speed = 6800,
369 ao_nchan:2, 369 .ao_nchan = 2,
370 has_ao_fifo:0, 370 .has_ao_fifo = 0,
371 fifo_size:1024, 371 .fifo_size = 1024,
372 ranges: &cb_pcidas_ranges, 372 .ranges = &cb_pcidas_ranges,
373 trimpot: AD7376, 373 .trimpot = AD7376,
374 has_dac08:0, 374 .has_dac08 = 0,
375 }, 375 },
376}; 376};
377 377
@@ -444,10 +444,10 @@ struct cb_pcidas_private {
444static int cb_pcidas_attach(struct comedi_device *dev, struct comedi_devconfig *it); 444static int cb_pcidas_attach(struct comedi_device *dev, struct comedi_devconfig *it);
445static int cb_pcidas_detach(struct comedi_device *dev); 445static int cb_pcidas_detach(struct comedi_device *dev);
446static struct comedi_driver driver_cb_pcidas = { 446static struct comedi_driver driver_cb_pcidas = {
447 driver_name:"cb_pcidas", 447 .driver_name = "cb_pcidas",
448 module:THIS_MODULE, 448 .module = THIS_MODULE,
449 attach:cb_pcidas_attach, 449 .attach = cb_pcidas_attach,
450 detach:cb_pcidas_detach, 450 .detach = cb_pcidas_detach,
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,
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 425c0f29645..49dfd8f09e2 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -560,24 +560,24 @@ struct pcidas64_board {
560}; 560};
561 561
562static const struct hw_fifo_info ai_fifo_4020 = { 562static const struct hw_fifo_info ai_fifo_4020 = {
563 num_segments:2, 563 .num_segments = 2,
564 max_segment_length:0x8000, 564 .max_segment_length = 0x8000,
565 sample_packing_ratio:2, 565 .sample_packing_ratio = 2,
566 fifo_size_reg_mask:0x7f, 566 .fifo_size_reg_mask = 0x7f,
567}; 567};
568 568
569static const struct hw_fifo_info ai_fifo_64xx = { 569static const struct hw_fifo_info ai_fifo_64xx = {
570 num_segments:4, 570 .num_segments = 4,
571 max_segment_length:0x800, 571 .max_segment_length = 0x800,
572 sample_packing_ratio:1, 572 .sample_packing_ratio = 1,
573 fifo_size_reg_mask:0x3f, 573 .fifo_size_reg_mask = 0x3f,
574}; 574};
575 575
576static const struct hw_fifo_info ai_fifo_60xx = { 576static const struct hw_fifo_info ai_fifo_60xx = {
577 num_segments:4, 577 .num_segments = 4,
578 max_segment_length:0x800, 578 .max_segment_length = 0x800,
579 sample_packing_ratio:1, 579 .sample_packing_ratio = 1,
580 fifo_size_reg_mask:0x7f, 580 .fifo_size_reg_mask = 0x7f,
581}; 581};
582 582
583/* maximum number of dma transfers we will chain together into a ring 583/* maximum number of dma transfers we will chain together into a ring
@@ -597,84 +597,84 @@ static const int bytes_in_sample = 2;
597 597
598static const struct pcidas64_board pcidas64_boards[] = { 598static const struct pcidas64_board pcidas64_boards[] = {
599 { 599 {
600 name: "pci-das6402/16", 600 .name = "pci-das6402/16",
601 device_id:0x1d, 601 .device_id = 0x1d,
602 ai_se_chans:64, 602 .ai_se_chans = 64,
603 ai_bits: 16, 603 .ai_bits = 16,
604 ai_speed:5000, 604 .ai_speed = 5000,
605 ao_nchan:2, 605 .ao_nchan = 2,
606 ao_bits: 16, 606 .ao_bits = 16,
607 ao_scan_speed:10000, 607 .ao_scan_speed = 10000,
608 layout: LAYOUT_64XX, 608 .layout = LAYOUT_64XX,
609 ai_range_table:&ai_ranges_64xx, 609 .ai_range_table = &ai_ranges_64xx,
610 ao_range_table:&ao_ranges_64xx, 610 .ao_range_table = &ao_ranges_64xx,
611 ao_range_code:ao_range_code_64xx, 611 .ao_range_code = ao_range_code_64xx,
612 ai_fifo: &ai_fifo_64xx, 612 .ai_fifo = &ai_fifo_64xx,
613 has_8255:1, 613 .has_8255 = 1,
614 }, 614 },
615 { 615 {
616 name: "pci-das6402/12", /* XXX check */ 616 .name = "pci-das6402/12", /* XXX check */
617 device_id:0x1e, 617 .device_id = 0x1e,
618 ai_se_chans:64, 618 .ai_se_chans = 64,
619 ai_bits: 12, 619 .ai_bits = 12,
620 ai_speed:5000, 620 .ai_speed = 5000,
621 ao_nchan:2, 621 .ao_nchan = 2,
622 ao_bits: 12, 622 .ao_bits = 12,
623 ao_scan_speed:10000, 623 .ao_scan_speed = 10000,
624 layout: LAYOUT_64XX, 624 .layout = LAYOUT_64XX,
625 ai_range_table:&ai_ranges_64xx, 625 .ai_range_table = &ai_ranges_64xx,
626 ao_range_table:&ao_ranges_64xx, 626 .ao_range_table = &ao_ranges_64xx,
627 ao_range_code:ao_range_code_64xx, 627 .ao_range_code = ao_range_code_64xx,
628 ai_fifo: &ai_fifo_64xx, 628 .ai_fifo = &ai_fifo_64xx,
629 has_8255:1, 629 .has_8255 = 1,
630 }, 630 },
631 { 631 {
632 name: "pci-das64/m1/16", 632 .name = "pci-das64/m1/16",
633 device_id:0x35, 633 .device_id = 0x35,
634 ai_se_chans:64, 634 .ai_se_chans = 64,
635 ai_bits: 16, 635 .ai_bits = 16,
636 ai_speed:1000, 636 .ai_speed = 1000,
637 ao_nchan:2, 637 .ao_nchan = 2,
638 ao_bits: 16, 638 .ao_bits = 16,
639 ao_scan_speed:10000, 639 .ao_scan_speed = 10000,
640 layout: LAYOUT_64XX, 640 .layout = LAYOUT_64XX,
641 ai_range_table:&ai_ranges_64xx, 641 .ai_range_table = &ai_ranges_64xx,
642 ao_range_table:&ao_ranges_64xx, 642 .ao_range_table = &ao_ranges_64xx,
643 ao_range_code:ao_range_code_64xx, 643 .ao_range_code = ao_range_code_64xx,
644 ai_fifo: &ai_fifo_64xx, 644 .ai_fifo = &ai_fifo_64xx,
645 has_8255:1, 645 .has_8255 = 1,
646 }, 646 },
647 { 647 {
648 name: "pci-das64/m2/16", 648 .name = "pci-das64/m2/16",
649 device_id:0x36, 649 .device_id = 0x36,
650 ai_se_chans:64, 650 .ai_se_chans = 64,
651 ai_bits: 16, 651 .ai_bits = 16,
652 ai_speed:500, 652 .ai_speed = 500,
653 ao_nchan:2, 653 .ao_nchan = 2,
654 ao_bits: 16, 654 .ao_bits = 16,
655 ao_scan_speed:10000, 655 .ao_scan_speed = 10000,
656 layout: LAYOUT_64XX, 656 .layout = LAYOUT_64XX,
657 ai_range_table:&ai_ranges_64xx, 657 .ai_range_table = &ai_ranges_64xx,
658 ao_range_table:&ao_ranges_64xx, 658 .ao_range_table = &ao_ranges_64xx,
659 ao_range_code:ao_range_code_64xx, 659 .ao_range_code = ao_range_code_64xx,
660 ai_fifo: &ai_fifo_64xx, 660 .ai_fifo = &ai_fifo_64xx,
661 has_8255:1, 661 .has_8255 = 1,
662 }, 662 },
663 { 663 {
664 name: "pci-das64/m3/16", 664 .name = "pci-das64/m3/16",
665 device_id:0x37, 665 .device_id = 0x37,
666 ai_se_chans:64, 666 .ai_se_chans = 64,
667 ai_bits: 16, 667 .ai_bits = 16,
668 ai_speed:333, 668 .ai_speed = 333,
669 ao_nchan:2, 669 .ao_nchan = 2,
670 ao_bits: 16, 670 .ao_bits = 16,
671 ao_scan_speed:10000, 671 .ao_scan_speed = 10000,
672 layout: LAYOUT_64XX, 672 .layout = LAYOUT_64XX,
673 ai_range_table:&ai_ranges_64xx, 673 .ai_range_table = &ai_ranges_64xx,
674 ao_range_table:&ao_ranges_64xx, 674 .ao_range_table = &ao_ranges_64xx,
675 ao_range_code:ao_range_code_64xx, 675 .ao_range_code = ao_range_code_64xx,
676 ai_fifo: &ai_fifo_64xx, 676 .ai_fifo = &ai_fifo_64xx,
677 has_8255:1, 677 .has_8255 = 1,
678 }, 678 },
679 { 679 {
680 .name = "pci-das6013", 680 .name = "pci-das6013",
@@ -692,324 +692,324 @@ static const struct pcidas64_board pcidas64_boards[] = {
692 .has_8255 = 0, 692 .has_8255 = 0,
693 }, 693 },
694 { 694 {
695 name: "pci-das6014", 695 .name = "pci-das6014",
696 device_id:0x79, 696 .device_id = 0x79,
697 ai_se_chans:16, 697 .ai_se_chans = 16,
698 ai_bits: 16, 698 .ai_bits = 16,
699 ai_speed:5000, 699 .ai_speed = 5000,
700 ao_nchan:2, 700 .ao_nchan = 2,
701 ao_bits: 16, 701 .ao_bits = 16,
702 ao_scan_speed:100000, 702 .ao_scan_speed = 100000,
703 layout: LAYOUT_60XX, 703 .layout = LAYOUT_60XX,
704 ai_range_table:&ai_ranges_60xx, 704 .ai_range_table = &ai_ranges_60xx,
705 ao_range_table:&ao_ranges_60xx, 705 .ao_range_table = &ao_ranges_60xx,
706 ao_range_code:ao_range_code_60xx, 706 .ao_range_code = ao_range_code_60xx,
707 ai_fifo: &ai_fifo_60xx, 707 .ai_fifo = &ai_fifo_60xx,
708 has_8255:0, 708 .has_8255 = 0,
709 }, 709 },
710 { 710 {
711 name: "pci-das6023", 711 .name = "pci-das6023",
712 device_id:0x5d, 712 .device_id = 0x5d,
713 ai_se_chans:16, 713 .ai_se_chans = 16,
714 ai_bits: 12, 714 .ai_bits = 12,
715 ai_speed:5000, 715 .ai_speed = 5000,
716 ao_nchan:0, 716 .ao_nchan = 0,
717 ao_scan_speed:100000, 717 .ao_scan_speed = 100000,
718 layout: LAYOUT_60XX, 718 .layout = LAYOUT_60XX,
719 ai_range_table:&ai_ranges_60xx, 719 .ai_range_table = &ai_ranges_60xx,
720 ao_range_table:&ao_ranges_60xx, 720 .ao_range_table = &ao_ranges_60xx,
721 ao_range_code:ao_range_code_60xx, 721 .ao_range_code = ao_range_code_60xx,
722 ai_fifo: &ai_fifo_60xx, 722 .ai_fifo = &ai_fifo_60xx,
723 has_8255:1, 723 .has_8255 = 1,
724 }, 724 },
725 { 725 {
726 name: "pci-das6025", 726 .name = "pci-das6025",
727 device_id:0x5e, 727 .device_id = 0x5e,
728 ai_se_chans:16, 728 .ai_se_chans = 16,
729 ai_bits: 12, 729 .ai_bits = 12,
730 ai_speed:5000, 730 .ai_speed = 5000,
731 ao_nchan:2, 731 .ao_nchan = 2,
732 ao_bits: 12, 732 .ao_bits = 12,
733 ao_scan_speed:100000, 733 .ao_scan_speed = 100000,
734 layout: LAYOUT_60XX, 734 .layout = LAYOUT_60XX,
735 ai_range_table:&ai_ranges_60xx, 735 .ai_range_table = &ai_ranges_60xx,
736 ao_range_table:&ao_ranges_60xx, 736 .ao_range_table = &ao_ranges_60xx,
737 ao_range_code:ao_range_code_60xx, 737 .ao_range_code = ao_range_code_60xx,
738 ai_fifo: &ai_fifo_60xx, 738 .ai_fifo = &ai_fifo_60xx,
739 has_8255:1, 739 .has_8255 = 1,
740 }, 740 },
741 { 741 {
742 name: "pci-das6030", 742 .name = "pci-das6030",
743 device_id:0x5f, 743 .device_id = 0x5f,
744 ai_se_chans:16, 744 .ai_se_chans = 16,
745 ai_bits: 16, 745 .ai_bits = 16,
746 ai_speed:10000, 746 .ai_speed = 10000,
747 ao_nchan:2, 747 .ao_nchan = 2,
748 ao_bits: 16, 748 .ao_bits = 16,
749 ao_scan_speed:10000, 749 .ao_scan_speed = 10000,
750 layout: LAYOUT_60XX, 750 .layout = LAYOUT_60XX,
751 ai_range_table:&ai_ranges_6030, 751 .ai_range_table = &ai_ranges_6030,
752 ao_range_table:&ao_ranges_6030, 752 .ao_range_table = &ao_ranges_6030,
753 ao_range_code:ao_range_code_6030, 753 .ao_range_code = ao_range_code_6030,
754 ai_fifo: &ai_fifo_60xx, 754 .ai_fifo = &ai_fifo_60xx,
755 has_8255:0, 755 .has_8255 = 0,
756 }, 756 },
757 { 757 {
758 name: "pci-das6031", 758 .name = "pci-das6031",
759 device_id:0x60, 759 .device_id = 0x60,
760 ai_se_chans:64, 760 .ai_se_chans = 64,
761 ai_bits: 16, 761 .ai_bits = 16,
762 ai_speed:10000, 762 .ai_speed = 10000,
763 ao_nchan:2, 763 .ao_nchan = 2,
764 ao_bits: 16, 764 .ao_bits = 16,
765 ao_scan_speed:10000, 765 .ao_scan_speed = 10000,
766 layout: LAYOUT_60XX, 766 .layout = LAYOUT_60XX,
767 ai_range_table:&ai_ranges_6030, 767 .ai_range_table = &ai_ranges_6030,
768 ao_range_table:&ao_ranges_6030, 768 .ao_range_table = &ao_ranges_6030,
769 ao_range_code:ao_range_code_6030, 769 .ao_range_code = ao_range_code_6030,
770 ai_fifo: &ai_fifo_60xx, 770 .ai_fifo = &ai_fifo_60xx,
771 has_8255:0, 771 .has_8255 = 0,
772 }, 772 },
773 { 773 {
774 name: "pci-das6032", 774 .name = "pci-das6032",
775 device_id:0x61, 775 .device_id = 0x61,
776 ai_se_chans:16, 776 .ai_se_chans = 16,
777 ai_bits: 16, 777 .ai_bits = 16,
778 ai_speed:10000, 778 .ai_speed = 10000,
779 ao_nchan:0, 779 .ao_nchan = 0,
780 layout: LAYOUT_60XX, 780 .layout = LAYOUT_60XX,
781 ai_range_table:&ai_ranges_6030, 781 .ai_range_table = &ai_ranges_6030,
782 ai_fifo: &ai_fifo_60xx, 782 .ai_fifo = &ai_fifo_60xx,
783 has_8255:0, 783 .has_8255 = 0,
784 }, 784 },
785 { 785 {
786 name: "pci-das6033", 786 .name = "pci-das6033",
787 device_id:0x62, 787 .device_id = 0x62,
788 ai_se_chans:64, 788 .ai_se_chans = 64,
789 ai_bits: 16, 789 .ai_bits = 16,
790 ai_speed:10000, 790 .ai_speed = 10000,
791 ao_nchan:0, 791 .ao_nchan = 0,
792 layout: LAYOUT_60XX, 792 .layout = LAYOUT_60XX,
793 ai_range_table:&ai_ranges_6030, 793 .ai_range_table = &ai_ranges_6030,
794 ai_fifo: &ai_fifo_60xx, 794 .ai_fifo = &ai_fifo_60xx,
795 has_8255:0, 795 .has_8255 = 0,
796 }, 796 },
797 { 797 {
798 name: "pci-das6034", 798 .name = "pci-das6034",
799 device_id:0x63, 799 .device_id = 0x63,
800 ai_se_chans:16, 800 .ai_se_chans = 16,
801 ai_bits: 16, 801 .ai_bits = 16,
802 ai_speed:5000, 802 .ai_speed = 5000,
803 ao_nchan:0, 803 .ao_nchan = 0,
804 ao_scan_speed:0, 804 .ao_scan_speed = 0,
805 layout: LAYOUT_60XX, 805 .layout = LAYOUT_60XX,
806 ai_range_table:&ai_ranges_60xx, 806 .ai_range_table = &ai_ranges_60xx,
807 ai_fifo: &ai_fifo_60xx, 807 .ai_fifo = &ai_fifo_60xx,
808 has_8255:0, 808 .has_8255 = 0,
809 }, 809 },
810 { 810 {
811 name: "pci-das6035", 811 .name = "pci-das6035",
812 device_id:0x64, 812 .device_id = 0x64,
813 ai_se_chans:16, 813 .ai_se_chans = 16,
814 ai_bits: 16, 814 .ai_bits = 16,
815 ai_speed:5000, 815 .ai_speed = 5000,
816 ao_nchan:2, 816 .ao_nchan = 2,
817 ao_bits: 12, 817 .ao_bits = 12,
818 ao_scan_speed:100000, 818 .ao_scan_speed = 100000,
819 layout: LAYOUT_60XX, 819 .layout = LAYOUT_60XX,
820 ai_range_table:&ai_ranges_60xx, 820 .ai_range_table = &ai_ranges_60xx,
821 ao_range_table:&ao_ranges_60xx, 821 .ao_range_table = &ao_ranges_60xx,
822 ao_range_code:ao_range_code_60xx, 822 .ao_range_code = ao_range_code_60xx,
823 ai_fifo: &ai_fifo_60xx, 823 .ai_fifo = &ai_fifo_60xx,
824 has_8255:0, 824 .has_8255 = 0,
825 }, 825 },
826 { 826 {
827 name: "pci-das6036", 827 .name = "pci-das6036",
828 device_id:0x6f, 828 .device_id = 0x6f,
829 ai_se_chans:16, 829 .ai_se_chans = 16,
830 ai_bits: 16, 830 .ai_bits = 16,
831 ai_speed:5000, 831 .ai_speed = 5000,
832 ao_nchan:2, 832 .ao_nchan = 2,
833 ao_bits: 16, 833 .ao_bits = 16,
834 ao_scan_speed:100000, 834 .ao_scan_speed = 100000,
835 layout: LAYOUT_60XX, 835 .layout = LAYOUT_60XX,
836 ai_range_table:&ai_ranges_60xx, 836 .ai_range_table = &ai_ranges_60xx,
837 ao_range_table:&ao_ranges_60xx, 837 .ao_range_table = &ao_ranges_60xx,
838 ao_range_code:ao_range_code_60xx, 838 .ao_range_code = ao_range_code_60xx,
839 ai_fifo: &ai_fifo_60xx, 839 .ai_fifo = &ai_fifo_60xx,
840 has_8255:0, 840 .has_8255 = 0,
841 }, 841 },
842 { 842 {
843 name: "pci-das6040", 843 .name = "pci-das6040",
844 device_id:0x65, 844 .device_id = 0x65,
845 ai_se_chans:16, 845 .ai_se_chans = 16,
846 ai_bits: 12, 846 .ai_bits = 12,
847 ai_speed:2000, 847 .ai_speed = 2000,
848 ao_nchan:2, 848 .ao_nchan = 2,
849 ao_bits: 12, 849 .ao_bits = 12,
850 ao_scan_speed:1000, 850 .ao_scan_speed = 1000,
851 layout: LAYOUT_60XX, 851 .layout = LAYOUT_60XX,
852 ai_range_table:&ai_ranges_6052, 852 .ai_range_table = &ai_ranges_6052,
853 ao_range_table:&ao_ranges_6030, 853 .ao_range_table = &ao_ranges_6030,
854 ao_range_code:ao_range_code_6030, 854 .ao_range_code = ao_range_code_6030,
855 ai_fifo: &ai_fifo_60xx, 855 .ai_fifo = &ai_fifo_60xx,
856 has_8255:0, 856 .has_8255 = 0,
857 }, 857 },
858 { 858 {
859 name: "pci-das6052", 859 .name = "pci-das6052",
860 device_id:0x66, 860 .device_id = 0x66,
861 ai_se_chans:16, 861 .ai_se_chans = 16,
862 ai_bits: 16, 862 .ai_bits = 16,
863 ai_speed:3333, 863 .ai_speed = 3333,
864 ao_nchan:2, 864 .ao_nchan = 2,
865 ao_bits: 16, 865 .ao_bits = 16,
866 ao_scan_speed:3333, 866 .ao_scan_speed = 3333,
867 layout: LAYOUT_60XX, 867 .layout = LAYOUT_60XX,
868 ai_range_table:&ai_ranges_6052, 868 .ai_range_table = &ai_ranges_6052,
869 ao_range_table:&ao_ranges_6030, 869 .ao_range_table = &ao_ranges_6030,
870 ao_range_code:ao_range_code_6030, 870 .ao_range_code = ao_range_code_6030,
871 ai_fifo: &ai_fifo_60xx, 871 .ai_fifo = &ai_fifo_60xx,
872 has_8255:0, 872 .has_8255 = 0,
873 }, 873 },
874 { 874 {
875 name: "pci-das6070", 875 .name = "pci-das6070",
876 device_id:0x67, 876 .device_id = 0x67,
877 ai_se_chans:16, 877 .ai_se_chans = 16,
878 ai_bits: 12, 878 .ai_bits = 12,
879 ai_speed:800, 879 .ai_speed = 800,
880 ao_nchan:2, 880 .ao_nchan = 2,
881 ao_bits: 12, 881 .ao_bits = 12,
882 ao_scan_speed:1000, 882 .ao_scan_speed = 1000,
883 layout: LAYOUT_60XX, 883 .layout = LAYOUT_60XX,
884 ai_range_table:&ai_ranges_6052, 884 .ai_range_table = &ai_ranges_6052,
885 ao_range_table:&ao_ranges_6030, 885 .ao_range_table = &ao_ranges_6030,
886 ao_range_code:ao_range_code_6030, 886 .ao_range_code = ao_range_code_6030,
887 ai_fifo: &ai_fifo_60xx, 887 .ai_fifo = &ai_fifo_60xx,
888 has_8255:0, 888 .has_8255 = 0,
889 }, 889 },
890 { 890 {
891 name: "pci-das6071", 891 .name = "pci-das6071",
892 device_id:0x68, 892 .device_id = 0x68,
893 ai_se_chans:64, 893 .ai_se_chans = 64,
894 ai_bits: 12, 894 .ai_bits = 12,
895 ai_speed:800, 895 .ai_speed = 800,
896 ao_nchan:2, 896 .ao_nchan = 2,
897 ao_bits: 12, 897 .ao_bits = 12,
898 ao_scan_speed:1000, 898 .ao_scan_speed = 1000,
899 layout: LAYOUT_60XX, 899 .layout = LAYOUT_60XX,
900 ai_range_table:&ai_ranges_6052, 900 .ai_range_table = &ai_ranges_6052,
901 ao_range_table:&ao_ranges_6030, 901 .ao_range_table = &ao_ranges_6030,
902 ao_range_code:ao_range_code_6030, 902 .ao_range_code = ao_range_code_6030,
903 ai_fifo: &ai_fifo_60xx, 903 .ai_fifo = &ai_fifo_60xx,
904 has_8255:0, 904 .has_8255 = 0,
905 }, 905 },
906 { 906 {
907 name: "pci-das4020/12", 907 .name = "pci-das4020/12",
908 device_id:0x52, 908 .device_id = 0x52,
909 ai_se_chans:4, 909 .ai_se_chans = 4,
910 ai_bits: 12, 910 .ai_bits = 12,
911 ai_speed:50, 911 .ai_speed = 50,
912 ao_bits: 12, 912 .ao_bits = 12,
913 ao_nchan:2, 913 .ao_nchan = 2,
914 ao_scan_speed:0, /* no hardware pacing on ao */ 914 .ao_scan_speed = 0, /* no hardware pacing on ao */
915 layout: LAYOUT_4020, 915 .layout = LAYOUT_4020,
916 ai_range_table:&ai_ranges_4020, 916 .ai_range_table = &ai_ranges_4020,
917 ao_range_table:&ao_ranges_4020, 917 .ao_range_table = &ao_ranges_4020,
918 ao_range_code:ao_range_code_4020, 918 .ao_range_code = ao_range_code_4020,
919 ai_fifo: &ai_fifo_4020, 919 .ai_fifo = &ai_fifo_4020,
920 has_8255:1, 920 .has_8255 = 1,
921 }, 921 },
922#if 0 922#if 0
923 { 923 {
924 name: "pci-das6402/16/jr", 924 .name = "pci-das6402/16/jr",
925 device_id:0 /* XXX, */ 925 .device_id = 0 /* XXX, */
926 ai_se_chans:64, 926 .ai_se_chans = 64,
927 ai_bits: 16, 927 .ai_bits = 16,
928 ai_speed:5000, 928 .ai_speed = 5000,
929 ao_nchan:0, 929 .ao_nchan = 0,
930 ao_scan_speed:10000, 930 .ao_scan_speed = 10000,
931 layout: LAYOUT_64XX, 931 .layout = LAYOUT_64XX,
932 ai_range_table:&ai_ranges_64xx, 932 .ai_range_table = &ai_ranges_64xx,
933 ai_fifo: ai_fifo_64xx, 933 .ai_fifo = ai_fifo_64xx,
934 has_8255:1, 934 .has_8255 = 1,
935 }, 935 },
936 { 936 {
937 name: "pci-das64/m1/16/jr", 937 .name = "pci-das64/m1/16/jr",
938 device_id:0 /* XXX, */ 938 .device_id = 0 /* XXX, */
939 ai_se_chans:64, 939 .ai_se_chans = 64,
940 ai_bits: 16, 940 .ai_bits = 16,
941 ai_speed:1000, 941 .ai_speed = 1000,
942 ao_nchan:0, 942 .ao_nchan = 0,
943 ao_scan_speed:10000, 943 .ao_scan_speed = 10000,
944 layout: LAYOUT_64XX, 944 .layout = LAYOUT_64XX,
945 ai_range_table:&ai_ranges_64xx, 945 .ai_range_table = &ai_ranges_64xx,
946 ai_fifo: ai_fifo_64xx, 946 .ai_fifo = ai_fifo_64xx,
947 has_8255:1, 947 .has_8255 = 1,
948 }, 948 },
949 { 949 {
950 name: "pci-das64/m2/16/jr", 950 .name = "pci-das64/m2/16/jr",
951 device_id:0 /* XXX, */ 951 .device_id = 0 /* XXX, */
952 ai_se_chans:64, 952 .ai_se_chans = 64,
953 ai_bits: 16, 953 .ai_bits = 16,
954 ai_speed:500, 954 .ai_speed = 500,
955 ao_nchan:0, 955 .ao_nchan = 0,
956 ao_scan_speed:10000, 956 .ao_scan_speed = 10000,
957 layout: LAYOUT_64XX, 957 .layout = LAYOUT_64XX,
958 ai_range_table:&ai_ranges_64xx, 958 .ai_range_table = &ai_ranges_64xx,
959 ai_fifo: ai_fifo_64xx, 959 .ai_fifo = ai_fifo_64xx,
960 has_8255:1, 960 .has_8255 = 1,
961 }, 961 },
962 { 962 {
963 name: "pci-das64/m3/16/jr", 963 .name = "pci-das64/m3/16/jr",
964 device_id:0 /* XXX, */ 964 .device_id = 0 /* XXX, */
965 ai_se_chans:64, 965 .ai_se_chans = 64,
966 ai_bits: 16, 966 .ai_bits = 16,
967 ai_speed:333, 967 .ai_speed = 333,
968 ao_nchan:0, 968 .ao_nchan = 0,
969 ao_scan_speed:10000, 969 .ao_scan_speed = 10000,
970 layout: LAYOUT_64XX, 970 .layout = LAYOUT_64XX,
971 ai_range_table:&ai_ranges_64xx, 971 .ai_range_table = &ai_ranges_64xx,
972 ai_fifo: ai_fifo_64xx, 972 .ai_fifo = ai_fifo_64xx,
973 has_8255:1, 973 .has_8255 = 1,
974 }, 974 },
975 { 975 {
976 name: "pci-das64/m1/14", 976 .name = "pci-das64/m1/14",
977 device_id:0, /* XXX */ 977 .device_id = 0, /* XXX */
978 ai_se_chans:64, 978 .ai_se_chans = 64,
979 ai_bits: 14, 979 .ai_bits = 14,
980 ai_speed:1000, 980 .ai_speed = 1000,
981 ao_nchan:2, 981 .ao_nchan = 2,
982 ao_scan_speed:10000, 982 .ao_scan_speed = 10000,
983 layout: LAYOUT_64XX, 983 .layout = LAYOUT_64XX,
984 ai_range_table:&ai_ranges_64xx, 984 .ai_range_table = &ai_ranges_64xx,
985 ai_fifo: ai_fifo_64xx, 985 .ai_fifo = ai_fifo_64xx,
986 has_8255:1, 986 .has_8255 = 1,
987 }, 987 },
988 { 988 {
989 name: "pci-das64/m2/14", 989 .name = "pci-das64/m2/14",
990 device_id:0, /* XXX */ 990 .device_id = 0, /* XXX */
991 ai_se_chans:64, 991 .ai_se_chans = 64,
992 ai_bits: 14, 992 .ai_bits = 14,
993 ai_speed:500, 993 .ai_speed = 500,
994 ao_nchan:2, 994 .ao_nchan = 2,
995 ao_scan_speed:10000, 995 .ao_scan_speed = 10000,
996 layout: LAYOUT_64XX, 996 .layout = LAYOUT_64XX,
997 ai_range_table:&ai_ranges_64xx, 997 .ai_range_table = &ai_ranges_64xx,
998 ai_fifo: ai_fifo_64xx, 998 .ai_fifo = ai_fifo_64xx,
999 has_8255:1, 999 .has_8255 = 1,
1000 }, 1000 },
1001 { 1001 {
1002 name: "pci-das64/m3/14", 1002 .name = "pci-das64/m3/14",
1003 device_id:0, /* XXX */ 1003 .device_id = 0, /* XXX */
1004 ai_se_chans:64, 1004 .ai_se_chans = 64,
1005 ai_bits: 14, 1005 .ai_bits = 14,
1006 ai_speed:333, 1006 .ai_speed = 333,
1007 ao_nchan:2, 1007 .ao_nchan = 2,
1008 ao_scan_speed:10000, 1008 .ao_scan_speed = 10000,
1009 layout: LAYOUT_64XX, 1009 .layout = LAYOUT_64XX,
1010 ai_range_table:&ai_ranges_64xx, 1010 .ai_range_table = &ai_ranges_64xx,
1011 ai_fifo: ai_fifo_64xx, 1011 .ai_fifo = ai_fifo_64xx,
1012 has_8255:1, 1012 .has_8255 = 1,
1013 }, 1013 },
1014#endif 1014#endif
1015}; 1015};
@@ -1131,10 +1131,10 @@ static inline struct pcidas64_private *priv(struct comedi_device * dev)
1131static int attach(struct comedi_device *dev, struct comedi_devconfig *it); 1131static int attach(struct comedi_device *dev, struct comedi_devconfig *it);
1132static int detach(struct comedi_device *dev); 1132static int detach(struct comedi_device *dev);
1133static struct comedi_driver driver_cb_pcidas = { 1133static struct comedi_driver driver_cb_pcidas = {
1134 driver_name:"cb_pcidas64", 1134 .driver_name = "cb_pcidas64",
1135 module:THIS_MODULE, 1135 .module = THIS_MODULE,
1136 attach:attach, 1136 .attach = attach,
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,
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index d87b04c9f93..8f362941618 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -147,52 +147,52 @@ struct cb_pcidda_board {
147 147
148static const struct cb_pcidda_board cb_pcidda_boards[] = { 148static const struct cb_pcidda_board cb_pcidda_boards[] = {
149 { 149 {
150 name: "pci-dda02/12", 150 .name = "pci-dda02/12",
151 status: 1, 151 .status = 1,
152 device_id:0x20, 152 .device_id = 0x20,
153 ao_chans:2, 153 .ao_chans = 2,
154 ao_bits: 12, 154 .ao_bits = 12,
155 ranges: &cb_pcidda_ranges, 155 .ranges = &cb_pcidda_ranges,
156 }, 156 },
157 { 157 {
158 name: "pci-dda04/12", 158 .name = "pci-dda04/12",
159 status: 1, 159 .status = 1,
160 device_id:0x21, 160 .device_id = 0x21,
161 ao_chans:4, 161 .ao_chans = 4,
162 ao_bits: 12, 162 .ao_bits = 12,
163 ranges: &cb_pcidda_ranges, 163 .ranges = &cb_pcidda_ranges,
164 }, 164 },
165 { 165 {
166 name: "pci-dda08/12", 166 .name = "pci-dda08/12",
167 status: 0, 167 .status = 0,
168 device_id:0x22, 168 .device_id = 0x22,
169 ao_chans:8, 169 .ao_chans = 8,
170 ao_bits: 12, 170 .ao_bits = 12,
171 ranges: &cb_pcidda_ranges, 171 .ranges = &cb_pcidda_ranges,
172 }, 172 },
173 { 173 {
174 name: "pci-dda02/16", 174 .name = "pci-dda02/16",
175 status: 2, 175 .status = 2,
176 device_id:0x23, 176 .device_id = 0x23,
177 ao_chans:2, 177 .ao_chans = 2,
178 ao_bits: 16, 178 .ao_bits = 16,
179 ranges: &cb_pcidda_ranges, 179 .ranges = &cb_pcidda_ranges,
180 }, 180 },
181 { 181 {
182 name: "pci-dda04/16", 182 .name = "pci-dda04/16",
183 status: 2, 183 .status = 2,
184 device_id:0x24, 184 .device_id = 0x24,
185 ao_chans:4, 185 .ao_chans = 4,
186 ao_bits: 16, 186 .ao_bits = 16,
187 ranges: &cb_pcidda_ranges, 187 .ranges = &cb_pcidda_ranges,
188 }, 188 },
189 { 189 {
190 name: "pci-dda08/16", 190 .name = "pci-dda08/16",
191 status: 0, 191 .status = 0,
192 device_id:0x25, 192 .device_id = 0x25,
193 ao_chans:8, 193 .ao_chans = 8,
194 ao_bits: 16, 194 .ao_bits = 16,
195 ranges: &cb_pcidda_ranges, 195 .ranges = &cb_pcidda_ranges,
196 }, 196 },
197}; 197};
198 198
@@ -264,10 +264,10 @@ static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel,
264 * the device code. 264 * the device code.
265 */ 265 */
266static struct comedi_driver driver_cb_pcidda = { 266static struct comedi_driver driver_cb_pcidda = {
267 driver_name:"cb_pcidda", 267 .driver_name = "cb_pcidda",
268 module:THIS_MODULE, 268 .module = THIS_MODULE,
269 attach:cb_pcidda_attach, 269 .attach = cb_pcidda_attach,
270 detach:cb_pcidda_detach, 270 .detach = cb_pcidda_detach,
271}; 271};
272 272
273/* 273/*
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c
index ec7b2e21c05..799b5aded13 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -63,22 +63,22 @@ struct pcidio_board {
63 63
64static const struct pcidio_board pcidio_boards[] = { 64static const struct pcidio_board pcidio_boards[] = {
65 { 65 {
66 name: "pci-dio24", 66 .name = "pci-dio24",
67 n_8255: 1, 67 .n_8255 = 1,
68 pcicontroler_badrindex:1, 68 .pcicontroler_badrindex = 1,
69 dioregs_badrindex:2, 69 .dioregs_badrindex = 2,
70 }, 70 },
71 { 71 {
72 name: "pci-dio24h", 72 .name = "pci-dio24h",
73 n_8255: 1, 73 .n_8255 = 1,
74 pcicontroler_badrindex:1, 74 .pcicontroler_badrindex = 1,
75 dioregs_badrindex:2, 75 .dioregs_badrindex = 2,
76 }, 76 },
77 { 77 {
78 name: "pci-dio48h", 78 .name = "pci-dio48h",
79 n_8255: 2, 79 .n_8255 = 2,
80 pcicontroler_badrindex:0, 80 .pcicontroler_badrindex = 0,
81 dioregs_badrindex:1, 81 .dioregs_badrindex = 1,
82 }, 82 },
83}; 83};
84 84
@@ -130,10 +130,10 @@ struct pcidio_private {
130static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it); 130static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it);
131static int pcidio_detach(struct comedi_device *dev); 131static int pcidio_detach(struct comedi_device *dev);
132static struct comedi_driver driver_cb_pcidio = { 132static struct comedi_driver driver_cb_pcidio = {
133 driver_name:"cb_pcidio", 133 .driver_name = "cb_pcidio",
134 module:THIS_MODULE, 134 .module = THIS_MODULE,
135 attach:pcidio_attach, 135 .attach = pcidio_attach,
136 detach:pcidio_detach, 136 .detach = pcidio_detach,
137 137
138/* It is not necessary to implement the following members if you are 138/* It is not necessary to implement the following members if you are
139 * writing a driver for a ISA PnP or PCI card */ 139 * writing a driver for a ISA PnP or PCI card */
@@ -158,9 +158,9 @@ static struct comedi_driver driver_cb_pcidio = {
158/* The following fields should NOT be initialized if you are dealing 158/* The following fields should NOT be initialized if you are dealing
159 * with PCI devices 159 * with PCI devices
160 * 160 *
161 * board_name: pcidio_boards, 161 * .board_name = pcidio_boards,
162 * offset: sizeof(struct pcidio_board), 162 * .offset = sizeof(struct pcidio_board),
163 * num_names: sizeof(pcidio_boards) / sizeof(structpcidio_board), 163 * .num_names = sizeof(pcidio_boards) / sizeof(structpcidio_board),
164 */ 164 */
165 165
166}; 166};
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 0e20eadac2d..13f793b76c6 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -102,21 +102,21 @@ struct cb_pcimdas_board {
102 102
103static const struct cb_pcimdas_board cb_pcimdas_boards[] = { 103static const struct cb_pcimdas_board cb_pcimdas_boards[] = {
104 { 104 {
105 name: "PCIM-DAS1602/16", 105 .name = "PCIM-DAS1602/16",
106 device_id:0x56, 106 .device_id = 0x56,
107 ai_se_chans:16, 107 .ai_se_chans = 16,
108 ai_diff_chans:8, 108 .ai_diff_chans = 8,
109 ai_bits: 16, 109 .ai_bits = 16,
110 ai_speed:10000, /* ?? */ 110 .ai_speed = 10000, /* ?? */
111 ao_nchan:2, 111 .ao_nchan = 2,
112 ao_bits: 12, 112 .ao_bits = 12,
113 has_ao_fifo:0, /* ?? */ 113 .has_ao_fifo = 0, /* ?? */
114 ao_scan_speed:10000, 114 .ao_scan_speed = 10000,
115 /* ?? */ 115 /* ?? */
116 fifo_size:1024, 116 .fifo_size = 1024,
117 dio_bits:24, 117 .dio_bits = 24,
118 has_dio: 1, 118 .has_dio = 1,
119/* ranges: &cb_pcimdas_ranges, */ 119/* .ranges = &cb_pcimdas_ranges, */
120 }, 120 },
121}; 121};
122 122
@@ -178,10 +178,10 @@ struct cb_pcimdas_private {
178static int cb_pcimdas_attach(struct comedi_device *dev, struct comedi_devconfig *it); 178static int cb_pcimdas_attach(struct comedi_device *dev, struct comedi_devconfig *it);
179static int cb_pcimdas_detach(struct comedi_device *dev); 179static int cb_pcimdas_detach(struct comedi_device *dev);
180static struct comedi_driver driver_cb_pcimdas = { 180static struct comedi_driver driver_cb_pcimdas = {
181 driver_name:"cb_pcimdas", 181 .driver_name = "cb_pcimdas",
182 module:THIS_MODULE, 182 .module = THIS_MODULE,
183 attach:cb_pcimdas_attach, 183 .attach = cb_pcimdas_attach,
184 detach:cb_pcimdas_detach, 184 .detach = cb_pcimdas_detach,
185}; 185};
186 186
187static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, 187static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 0a1b2014295..3ce133c69e2 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -118,15 +118,15 @@ enum DIO_METHODS {
118 118
119static const struct board_struct boards[] = { 119static const struct board_struct boards[] = {
120 { 120 {
121 name: "cb_pcimdda06-16", 121 .name = "cb_pcimdda06-16",
122 device_id:PCI_ID_PCIM_DDA06_16, 122 .device_id = PCI_ID_PCIM_DDA06_16,
123 ao_chans:6, 123 .ao_chans = 6,
124 ao_bits: 16, 124 .ao_bits = 16,
125 dio_chans:24, 125 .dio_chans = 24,
126 dio_method:DIO_8255, 126 .dio_method = DIO_8255,
127 dio_offset:12, 127 .dio_offset = 12,
128 regs_badrindex:3, 128 .regs_badrindex = 3,
129 reg_sz: 16, 129 .reg_sz = 16,
130 } 130 }
131}; 131};
132 132
@@ -184,10 +184,10 @@ struct board_private_struct {
184static int attach(struct comedi_device *dev, struct comedi_devconfig *it); 184static int attach(struct comedi_device *dev, struct comedi_devconfig *it);
185static int detach(struct comedi_device *dev); 185static int detach(struct comedi_device *dev);
186static struct comedi_driver cb_pcimdda_driver = { 186static struct comedi_driver cb_pcimdda_driver = {
187 driver_name:"cb_pcimdda", 187 .driver_name = "cb_pcimdda",
188 module:THIS_MODULE, 188 .module = THIS_MODULE,
189 attach:attach, 189 .attach = attach,
190 detach:detach, 190 .detach = detach,
191}; 191};
192 192
193MODULE_AUTHOR("Calin A. Culianu <calin@rtlab.org>"); 193MODULE_AUTHOR("Calin A. Culianu <calin@rtlab.org>");
diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c
index ef8accd528c..3b21f4c8587 100644
--- a/drivers/staging/comedi/drivers/comedi_rt_timer.c
+++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c
@@ -152,11 +152,11 @@ static int timer_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
152static int timer_start_cmd(struct comedi_device *dev, struct comedi_subdevice *s); 152static int timer_start_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
153 153
154static struct comedi_driver driver_timer = { 154static struct comedi_driver driver_timer = {
155 module:THIS_MODULE, 155 .module = THIS_MODULE,
156 driver_name:"comedi_rt_timer", 156 .driver_name = "comedi_rt_timer",
157 attach:timer_attach, 157 .attach = timer_attach,
158 detach:timer_detach, 158 .detach = timer_detach,
159/* open: timer_open, */ 159/* .open = timer_open, */
160}; 160};
161 161
162COMEDI_INITCLEANUP(driver_timer); 162COMEDI_INITCLEANUP(driver_timer);
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 6c0d26e86c1..f2ad2484129 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -78,10 +78,10 @@ struct contec_private {
78static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it); 78static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it);
79static int contec_detach(struct comedi_device *dev); 79static int contec_detach(struct comedi_device *dev);
80static struct comedi_driver driver_contec = { 80static struct comedi_driver driver_contec = {
81 driver_name:"contec_pci_dio", 81 .driver_name = "contec_pci_dio",
82 module:THIS_MODULE, 82 .module = THIS_MODULE,
83 attach:contec_attach, 83 .attach = contec_attach,
84 detach:contec_detach, 84 .detach = contec_detach,
85}; 85};
86 86
87/* Classic digital IO */ 87/* Classic digital IO */
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 794fbb24aa3..bac642c55cd 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -300,10 +300,10 @@ static int daqboard2000_attach(struct comedi_device *dev, struct comedi_devconfi
300static int daqboard2000_detach(struct comedi_device *dev); 300static int daqboard2000_detach(struct comedi_device *dev);
301 301
302static struct comedi_driver driver_daqboard2000 = { 302static struct comedi_driver driver_daqboard2000 = {
303 driver_name:"daqboard2000", 303 .driver_name = "daqboard2000",
304 module:THIS_MODULE, 304 .module = THIS_MODULE,
305 attach:daqboard2000_attach, 305 .attach = daqboard2000_attach,
306 detach:daqboard2000_detach, 306 .detach = daqboard2000_detach,
307}; 307};
308 308
309struct daq200_boardtype { 309struct daq200_boardtype {
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index d7760e4aec1..2fa883edfef 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -248,211 +248,211 @@ static const int *const das08_gainlists[] = {
248 248
249static const struct das08_board_struct das08_boards[] = { 249static const struct das08_board_struct das08_boards[] = {
250 { 250 {
251 name: "isa-das08", /* cio-das08.pdf */ 251 .name = "isa-das08", /* cio-das08.pdf */
252 bustype: isa, 252 .bustype = isa,
253 ai: das08_ai_rinsn, 253 .ai = das08_ai_rinsn,
254 ai_nbits:12, 254 .ai_nbits = 12,
255 ai_pg: das08_pg_none, 255 .ai_pg = das08_pg_none,
256 ai_encoding:das08_encode12, 256 .ai_encoding = das08_encode12,
257 ao: NULL, 257 .ao = NULL,
258 ao_nbits:12, 258 .ao_nbits = 12,
259 di: das08_di_rbits, 259 .di = das08_di_rbits,
260 do_: das08_do_wbits, 260 .do_ = das08_do_wbits,
261 do_nchan:4, 261 .do_nchan = 4,
262 i8255_offset:8, 262 .i8255_offset = 8,
263 i8254_offset:4, 263 .i8254_offset = 4,
264 iosize: 16, /* unchecked */ 264 .iosize = 16, /* unchecked */
265 }, 265 },
266 { 266 {
267 name: "das08-pgm", /* cio-das08pgx.pdf */ 267 .name = "das08-pgm", /* cio-das08pgx.pdf */
268 bustype: isa, 268 .bustype = isa,
269 ai: das08_ai_rinsn, 269 .ai = das08_ai_rinsn,
270 ai_nbits:12, 270 .ai_nbits = 12,
271 ai_pg: das08_pgm, 271 .ai_pg = das08_pgm,
272 ai_encoding:das08_encode12, 272 .ai_encoding = das08_encode12,
273 ao: NULL, 273 .ao = NULL,
274 di: das08_di_rbits, 274 .di = das08_di_rbits,
275 do_: das08_do_wbits, 275 .do_ = das08_do_wbits,
276 do_nchan:4, 276 .do_nchan = 4,
277 i8255_offset:0, 277 .i8255_offset = 0,
278 i8254_offset:0x04, 278 .i8254_offset = 0x04,
279 iosize: 16, /* unchecked */ 279 .iosize = 16, /* unchecked */
280 }, 280 },
281 { 281 {
282 name: "das08-pgh", /* cio-das08pgx.pdf */ 282 .name = "das08-pgh", /* cio-das08pgx.pdf */
283 bustype: isa, 283 .bustype = isa,
284 ai: das08_ai_rinsn, 284 .ai = das08_ai_rinsn,
285 ai_nbits:12, 285 .ai_nbits = 12,
286 ai_pg: das08_pgh, 286 .ai_pg = das08_pgh,
287 ai_encoding:das08_encode12, 287 .ai_encoding = das08_encode12,
288 ao: NULL, 288 .ao = NULL,
289 di: das08_di_rbits, 289 .di = das08_di_rbits,
290 do_: das08_do_wbits, 290 .do_ = das08_do_wbits,
291 do_nchan:4, 291 .do_nchan = 4,
292 i8255_offset:0, 292 .i8255_offset = 0,
293 i8254_offset:0x04, 293 .i8254_offset = 0x04,
294 iosize: 16, /* unchecked */ 294 .iosize = 16, /* unchecked */
295 }, 295 },
296 { 296 {
297 name: "das08-pgl", /* cio-das08pgx.pdf */ 297 .name = "das08-pgl", /* cio-das08pgx.pdf */
298 bustype: isa, 298 .bustype = isa,
299 ai: das08_ai_rinsn, 299 .ai = das08_ai_rinsn,
300 ai_nbits:12, 300 .ai_nbits = 12,
301 ai_pg: das08_pgl, 301 .ai_pg = das08_pgl,
302 ai_encoding:das08_encode12, 302 .ai_encoding = das08_encode12,
303 ao: NULL, 303 .ao = NULL,
304 di: das08_di_rbits, 304 .di = das08_di_rbits,
305 do_: das08_do_wbits, 305 .do_ = das08_do_wbits,
306 do_nchan:4, 306 .do_nchan = 4,
307 i8255_offset:0, 307 .i8255_offset = 0,
308 i8254_offset:0x04, 308 .i8254_offset = 0x04,
309 iosize: 16, /* unchecked */ 309 .iosize = 16, /* unchecked */
310 }, 310 },
311 { 311 {
312 name: "das08-aoh", /* cio-das08_aox.pdf */ 312 .name = "das08-aoh", /* cio-das08_aox.pdf */
313 bustype: isa, 313 .bustype = isa,
314 ai: das08_ai_rinsn, 314 .ai = das08_ai_rinsn,
315 ai_nbits:12, 315 .ai_nbits = 12,
316 ai_pg: das08_pgh, 316 .ai_pg = das08_pgh,
317 ai_encoding:das08_encode12, 317 .ai_encoding = das08_encode12,
318 ao: das08ao_ao_winsn, /* 8 */ 318 .ao = das08ao_ao_winsn, /* 8 */
319 ao_nbits:12, 319 .ao_nbits = 12,
320 di: das08_di_rbits, 320 .di = das08_di_rbits,
321 do_: das08_do_wbits, 321 .do_ = das08_do_wbits,
322 do_nchan:4, 322 .do_nchan = 4,
323 i8255_offset:0x0c, 323 .i8255_offset = 0x0c,
324 i8254_offset:0x04, 324 .i8254_offset = 0x04,
325 iosize: 16, /* unchecked */ 325 .iosize = 16, /* unchecked */
326 }, 326 },
327 { 327 {
328 name: "das08-aol", /* cio-das08_aox.pdf */ 328 .name = "das08-aol", /* cio-das08_aox.pdf */
329 bustype: isa, 329 .bustype = isa,
330 ai: das08_ai_rinsn, 330 .ai = das08_ai_rinsn,
331 ai_nbits:12, 331 .ai_nbits = 12,
332 ai_pg: das08_pgl, 332 .ai_pg = das08_pgl,
333 ai_encoding:das08_encode12, 333 .ai_encoding = das08_encode12,
334 ao: das08ao_ao_winsn, /* 8 */ 334 .ao = das08ao_ao_winsn, /* 8 */
335 ao_nbits:12, 335 .ao_nbits = 12,
336 di: das08_di_rbits, 336 .di = das08_di_rbits,
337 do_: das08_do_wbits, 337 .do_ = das08_do_wbits,
338 do_nchan:4, 338 .do_nchan = 4,
339 i8255_offset:0x0c, 339 .i8255_offset = 0x0c,
340 i8254_offset:0x04, 340 .i8254_offset = 0x04,
341 iosize: 16, /* unchecked */ 341 .iosize = 16, /* unchecked */
342 }, 342 },
343 { 343 {
344 name: "das08-aom", /* cio-das08_aox.pdf */ 344 .name = "das08-aom", /* cio-das08_aox.pdf */
345 bustype: isa, 345 .bustype = isa,
346 ai: das08_ai_rinsn, 346 .ai = das08_ai_rinsn,
347 ai_nbits:12, 347 .ai_nbits = 12,
348 ai_pg: das08_pgm, 348 .ai_pg = das08_pgm,
349 ai_encoding:das08_encode12, 349 .ai_encoding = das08_encode12,
350 ao: das08ao_ao_winsn, /* 8 */ 350 .ao = das08ao_ao_winsn, /* 8 */
351 ao_nbits:12, 351 .ao_nbits = 12,
352 di: das08_di_rbits, 352 .di = das08_di_rbits,
353 do_: das08_do_wbits, 353 .do_ = das08_do_wbits,
354 do_nchan:4, 354 .do_nchan = 4,
355 i8255_offset:0x0c, 355 .i8255_offset = 0x0c,
356 i8254_offset:0x04, 356 .i8254_offset = 0x04,
357 iosize: 16, /* unchecked */ 357 .iosize = 16, /* unchecked */
358 }, 358 },
359 { 359 {
360 name: "das08/jr-ao", /* cio-das08-jr-ao.pdf */ 360 .name = "das08/jr-ao", /* cio-das08-jr-ao.pdf */
361 bustype: isa, 361 .bustype = isa,
362 ai: das08_ai_rinsn, 362 .ai = das08_ai_rinsn,
363 ai_nbits:12, 363 .ai_nbits = 12,
364 ai_pg: das08_pg_none, 364 .ai_pg = das08_pg_none,
365 ai_encoding:das08_encode12, 365 .ai_encoding = das08_encode12,
366 ao: das08jr_ao_winsn, 366 .ao = das08jr_ao_winsn,
367 ao_nbits:12, 367 .ao_nbits = 12,
368 di: das08jr_di_rbits, 368 .di = das08jr_di_rbits,
369 do_: das08jr_do_wbits, 369 .do_ = das08jr_do_wbits,
370 do_nchan:8, 370 .do_nchan = 8,
371 i8255_offset:0, 371 .i8255_offset = 0,
372 i8254_offset:0, 372 .i8254_offset = 0,
373 iosize: 16, /* unchecked */ 373 .iosize = 16, /* unchecked */
374 }, 374 },
375 { 375 {
376 name: "das08jr-16-ao", /* cio-das08jr-16-ao.pdf */ 376 .name = "das08jr-16-ao", /* cio-das08jr-16-ao.pdf */
377 bustype: isa, 377 .bustype = isa,
378 ai: das08_ai_rinsn, 378 .ai = das08_ai_rinsn,
379 ai_nbits:16, 379 .ai_nbits = 16,
380 ai_pg: das08_pg_none, 380 .ai_pg = das08_pg_none,
381 ai_encoding:das08_encode12, 381 .ai_encoding = das08_encode12,
382 ao: das08jr_ao_winsn, 382 .ao = das08jr_ao_winsn,
383 ao_nbits:16, 383 .ao_nbits = 16,
384 di: das08jr_di_rbits, 384 .di = das08jr_di_rbits,
385 do_: das08jr_do_wbits, 385 .do_ = das08jr_do_wbits,
386 do_nchan:8, 386 .do_nchan = 8,
387 i8255_offset:0, 387 .i8255_offset = 0,
388 i8254_offset:0x04, 388 .i8254_offset = 0x04,
389 iosize: 16, /* unchecked */ 389 .iosize = 16, /* unchecked */
390 }, 390 },
391#ifdef CONFIG_COMEDI_PCI 391#ifdef CONFIG_COMEDI_PCI
392 { 392 {
393 name: "das08", /* pci-das08 */ 393 .name = "das08", /* pci-das08 */
394 id: PCI_DEVICE_ID_PCIDAS08, 394 .id = PCI_DEVICE_ID_PCIDAS08,
395 bustype: pci, 395 .bustype = pci,
396 ai: das08_ai_rinsn, 396 .ai = das08_ai_rinsn,
397 ai_nbits:12, 397 .ai_nbits = 12,
398 ai_pg: das08_bipolar5, 398 .ai_pg = das08_bipolar5,
399 ai_encoding:das08_encode12, 399 .ai_encoding = das08_encode12,
400 ao: NULL, 400 .ao = NULL,
401 ao_nbits:0, 401 .ao_nbits = 0,
402 di: das08_di_rbits, 402 .di = das08_di_rbits,
403 do_: das08_do_wbits, 403 .do_ = das08_do_wbits,
404 do_nchan:4, 404 .do_nchan = 4,
405 i8255_offset:0, 405 .i8255_offset = 0,
406 i8254_offset:4, 406 .i8254_offset = 4,
407 iosize: 8, 407 .iosize = 8,
408 }, 408 },
409#endif 409#endif
410 { 410 {
411 name: "pc104-das08", 411 .name = "pc104-das08",
412 bustype: pc104, 412 .bustype = pc104,
413 ai: das08_ai_rinsn, 413 .ai = das08_ai_rinsn,
414 ai_nbits:12, 414 .ai_nbits = 12,
415 ai_pg: das08_pg_none, 415 .ai_pg = das08_pg_none,
416 ai_encoding:das08_encode12, 416 .ai_encoding = das08_encode12,
417 ao: NULL, 417 .ao = NULL,
418 ao_nbits:0, 418 .ao_nbits = 0,
419 di: das08_di_rbits, 419 .di = das08_di_rbits,
420 do_: das08_do_wbits, 420 .do_ = das08_do_wbits,
421 do_nchan:4, 421 .do_nchan = 4,
422 i8255_offset:0, 422 .i8255_offset = 0,
423 i8254_offset:4, 423 .i8254_offset = 4,
424 iosize: 16, /* unchecked */ 424 .iosize = 16, /* unchecked */
425 }, 425 },
426#if 0 426#if 0
427 { 427 {
428 name: "das08/f", 428 .name = "das08/f",
429 }, 429 },
430 { 430 {
431 name: "das08jr", 431 .name = "das08jr",
432 }, 432 },
433#endif 433#endif
434 { 434 {
435 name: "das08jr/16", 435 .name = "das08jr/16",
436 bustype: isa, 436 .bustype = isa,
437 ai: das08_ai_rinsn, 437 .ai = das08_ai_rinsn,
438 ai_nbits:16, 438 .ai_nbits = 16,
439 ai_pg: das08_pg_none, 439 .ai_pg = das08_pg_none,
440 ai_encoding:das08_encode16, 440 .ai_encoding = das08_encode16,
441 ao: NULL, 441 .ao = NULL,
442 ao_nbits:0, 442 .ao_nbits = 0,
443 di: das08jr_di_rbits, 443 .di = das08jr_di_rbits,
444 do_: das08jr_do_wbits, 444 .do_ = das08jr_do_wbits,
445 do_nchan:8, 445 .do_nchan = 8,
446 i8255_offset:0, 446 .i8255_offset = 0,
447 i8254_offset:0, 447 .i8254_offset = 0,
448 iosize: 16, /* unchecked */ 448 .iosize = 16, /* unchecked */
449 }, 449 },
450#if 0 450#if 0
451 { 451 {
452 name: "das48-pga", /* cio-das48-pga.pdf */ 452 .name = "das48-pga", /* cio-das48-pga.pdf */
453 }, 453 },
454 { 454 {
455 name: "das08-pga-g2", /* a KM board */ 455 .name = "das08-pga-g2", /* a KM board */
456 }, 456 },
457#endif 457#endif
458}; 458};
@@ -460,39 +460,39 @@ static const struct das08_board_struct das08_boards[] = {
460#ifdef CONFIG_COMEDI_PCMCIA 460#ifdef CONFIG_COMEDI_PCMCIA
461struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS] = { 461struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS] = {
462 { 462 {
463 name: "pcm-das08", 463 .name = "pcm-das08",
464 id: 0x0, /* XXX */ 464 .id = 0x0, /* XXX */
465 bustype: pcmcia, 465 .bustype = pcmcia,
466 ai: das08_ai_rinsn, 466 .ai = das08_ai_rinsn,
467 ai_nbits:12, 467 .ai_nbits = 12,
468 ai_pg: das08_bipolar5, 468 .ai_pg = das08_bipolar5,
469 ai_encoding:das08_pcm_encode12, 469 .ai_encoding = das08_pcm_encode12,
470 ao: NULL, 470 .ao = NULL,
471 ao_nbits:0, 471 .ao_nbits = 0,
472 di: das08_di_rbits, 472 .di = das08_di_rbits,
473 do_: das08_do_wbits, 473 .do_ = das08_do_wbits,
474 do_nchan:3, 474 .do_nchan = 3,
475 i8255_offset:0, 475 .i8255_offset = 0,
476 i8254_offset:0, 476 .i8254_offset = 0,
477 iosize: 16, 477 .iosize = 16,
478 }, 478 },
479 /* duplicate so driver name can be used also */ 479 /* duplicate so driver name can be used also */
480 { 480 {
481 name: "das08_cs", 481 .name = "das08_cs",
482 id: 0x0, /* XXX */ 482 .id = 0x0, /* XXX */
483 bustype: pcmcia, 483 .bustype = pcmcia,
484 ai: das08_ai_rinsn, 484 .ai = das08_ai_rinsn,
485 ai_nbits:12, 485 .ai_nbits = 12,
486 ai_pg: das08_bipolar5, 486 .ai_pg = das08_bipolar5,
487 ai_encoding:das08_pcm_encode12, 487 .ai_encoding = das08_pcm_encode12,
488 ao: NULL, 488 .ao = NULL,
489 ao_nbits:0, 489 .ao_nbits = 0,
490 di: das08_di_rbits, 490 .di = das08_di_rbits,
491 do_: das08_do_wbits, 491 .do_ = das08_do_wbits,
492 do_nchan:3, 492 .do_nchan = 3,
493 i8255_offset:0, 493 .i8255_offset = 0,
494 i8254_offset:0, 494 .i8254_offset = 0,
495 iosize: 16, 495 .iosize = 16,
496 }, 496 },
497}; 497};
498#endif 498#endif
@@ -830,14 +830,14 @@ static int das08_counter_config(struct comedi_device *dev, struct comedi_subdevi
830static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it); 830static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it);
831 831
832static struct comedi_driver driver_das08 = { 832static struct comedi_driver driver_das08 = {
833 driver_name: DRV_NAME, 833 .driver_name = DRV_NAME,
834 module:THIS_MODULE, 834 .module = THIS_MODULE,
835 attach:das08_attach, 835 .attach = das08_attach,
836 detach:das08_common_detach, 836 .detach = das08_common_detach,
837 board_name:&das08_boards[0].name, 837 .board_name = &das08_boards[0].name,
838 num_names:sizeof(das08_boards) / 838 .num_names = sizeof(das08_boards) /
839 sizeof(struct das08_board_struct), 839 sizeof(struct das08_board_struct),
840 offset:sizeof(struct das08_board_struct), 840 .offset = sizeof(struct das08_board_struct),
841}; 841};
842 842
843int das08_common_attach(struct comedi_device *dev, unsigned long iobase) 843int das08_common_attach(struct comedi_device *dev, unsigned long iobase)
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index a97739612f8..8e4464100e1 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -59,14 +59,14 @@ static struct pcmcia_device *cur_dev = NULL;
59static int das08_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it); 59static int das08_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it);
60 60
61static struct comedi_driver driver_das08_cs = { 61static struct comedi_driver driver_das08_cs = {
62 driver_name:"das08_cs", 62 .driver_name = "das08_cs",
63 module:THIS_MODULE, 63 .module = THIS_MODULE,
64 attach:das08_cs_attach, 64 .attach = das08_cs_attach,
65 detach:das08_common_detach, 65 .detach = das08_common_detach,
66 board_name:&das08_cs_boards[0].name, 66 .board_name = &das08_cs_boards[0].name,
67 num_names:sizeof(das08_cs_boards) / 67 .num_names = sizeof(das08_cs_boards) /
68 sizeof(struct das08_board_struct), 68 sizeof(struct das08_board_struct),
69 offset:sizeof(struct das08_board_struct), 69 .offset = sizeof(struct das08_board_struct),
70}; 70};
71 71
72static int das08_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) 72static int das08_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 090225128ce..4433f6446b3 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -375,323 +375,323 @@ struct das16_board {
375 375
376static const struct das16_board das16_boards[] = { 376static const struct das16_board das16_boards[] = {
377 { 377 {
378 name: "das-16", 378 .name = "das-16",
379 ai: das16_ai_rinsn, 379 .ai = das16_ai_rinsn,
380 ai_nbits:12, 380 .ai_nbits = 12,
381 ai_speed:15000, 381 .ai_speed = 15000,
382 ai_pg: das16_pg_none, 382 .ai_pg = das16_pg_none,
383 ao: das16_ao_winsn, 383 .ao = das16_ao_winsn,
384 ao_nbits:12, 384 .ao_nbits = 12,
385 di: das16_di_rbits, 385 .di = das16_di_rbits,
386 do_: das16_do_wbits, 386 .do_ = das16_do_wbits,
387 i8255_offset:0x10, 387 .i8255_offset = 0x10,
388 i8254_offset:0x0c, 388 .i8254_offset = 0x0c,
389 size: 0x14, 389 .size = 0x14,
390 id: 0x00, 390 .id = 0x00,
391 }, 391 },
392 { 392 {
393 name: "das-16g", 393 .name = "das-16g",
394 ai: das16_ai_rinsn, 394 .ai = das16_ai_rinsn,
395 ai_nbits:12, 395 .ai_nbits = 12,
396 ai_speed:15000, 396 .ai_speed = 15000,
397 ai_pg: das16_pg_none, 397 .ai_pg = das16_pg_none,
398 ao: das16_ao_winsn, 398 .ao = das16_ao_winsn,
399 ao_nbits:12, 399 .ao_nbits = 12,
400 di: das16_di_rbits, 400 .di = das16_di_rbits,
401 do_: das16_do_wbits, 401 .do_ = das16_do_wbits,
402 i8255_offset:0x10, 402 .i8255_offset = 0x10,
403 i8254_offset:0x0c, 403 .i8254_offset = 0x0c,
404 size: 0x14, 404 .size = 0x14,
405 id: 0x00, 405 .id = 0x00,
406 }, 406 },
407 { 407 {
408 name: "das-16f", 408 .name = "das-16f",
409 ai: das16_ai_rinsn, 409 .ai = das16_ai_rinsn,
410 ai_nbits:12, 410 .ai_nbits = 12,
411 ai_speed:8500, 411 .ai_speed = 8500,
412 ai_pg: das16_pg_none, 412 .ai_pg = das16_pg_none,
413 ao: das16_ao_winsn, 413 .ao = das16_ao_winsn,
414 ao_nbits:12, 414 .ao_nbits = 12,
415 di: das16_di_rbits, 415 .di = das16_di_rbits,
416 do_: das16_do_wbits, 416 .do_ = das16_do_wbits,
417 i8255_offset:0x10, 417 .i8255_offset = 0x10,
418 i8254_offset:0x0c, 418 .i8254_offset = 0x0c,
419 size: 0x14, 419 .size = 0x14,
420 id: 0x00, 420 .id = 0x00,
421 }, 421 },
422 { 422 {
423 name: "cio-das16", /* cio-das16.pdf */ 423 .name = "cio-das16", /* cio-das16.pdf */
424 ai: das16_ai_rinsn, 424 .ai = das16_ai_rinsn,
425 ai_nbits:12, 425 .ai_nbits = 12,
426 ai_speed:20000, 426 .ai_speed = 20000,
427 ai_pg: das16_pg_none, 427 .ai_pg = das16_pg_none,
428 ao: das16_ao_winsn, 428 .ao = das16_ao_winsn,
429 ao_nbits:12, 429 .ao_nbits = 12,
430 di: das16_di_rbits, 430 .di = das16_di_rbits,
431 do_: das16_do_wbits, 431 .do_ = das16_do_wbits,
432 i8255_offset:0x10, 432 .i8255_offset = 0x10,
433 i8254_offset:0x0c, 433 .i8254_offset = 0x0c,
434 size: 0x14, 434 .size = 0x14,
435 id: 0x80, 435 .id = 0x80,
436 }, 436 },
437 { 437 {
438 name: "cio-das16/f", /* das16.pdf */ 438 .name = "cio-das16/f", /* das16.pdf */
439 ai: das16_ai_rinsn, 439 .ai = das16_ai_rinsn,
440 ai_nbits:12, 440 .ai_nbits = 12,
441 ai_speed:10000, 441 .ai_speed = 10000,
442 ai_pg: das16_pg_none, 442 .ai_pg = das16_pg_none,
443 ao: das16_ao_winsn, 443 .ao = das16_ao_winsn,
444 ao_nbits:12, 444 .ao_nbits = 12,
445 di: das16_di_rbits, 445 .di = das16_di_rbits,
446 do_: das16_do_wbits, 446 .do_ = das16_do_wbits,
447 i8255_offset:0x10, 447 .i8255_offset = 0x10,
448 i8254_offset:0x0c, 448 .i8254_offset = 0x0c,
449 size: 0x14, 449 .size = 0x14,
450 id: 0x80, 450 .id = 0x80,
451 }, 451 },
452 { 452 {
453 name: "cio-das16/jr", /* cio-das16jr.pdf */ 453 .name = "cio-das16/jr", /* cio-das16jr.pdf */
454 ai: das16_ai_rinsn, 454 .ai = das16_ai_rinsn,
455 ai_nbits:12, 455 .ai_nbits = 12,
456 ai_speed:7692, 456 .ai_speed = 7692,
457 ai_pg: das16_pg_16jr, 457 .ai_pg = das16_pg_16jr,
458 ao: NULL, 458 .ao = NULL,
459 di: das16_di_rbits, 459 .di = das16_di_rbits,
460 do_: das16_do_wbits, 460 .do_ = das16_do_wbits,
461 i8255_offset:0, 461 .i8255_offset = 0,
462 i8254_offset:0x0c, 462 .i8254_offset = 0x0c,
463 size: 0x10, 463 .size = 0x10,
464 id: 0x00, 464 .id = 0x00,
465 }, 465 },
466 { 466 {
467 name: "pc104-das16jr", /* pc104-das16jr_xx.pdf */ 467 .name = "pc104-das16jr", /* pc104-das16jr_xx.pdf */
468 ai: das16_ai_rinsn, 468 .ai = das16_ai_rinsn,
469 ai_nbits:12, 469 .ai_nbits = 12,
470 ai_speed:3300, 470 .ai_speed = 3300,
471 ai_pg: das16_pg_16jr, 471 .ai_pg = das16_pg_16jr,
472 ao: NULL, 472 .ao = NULL,
473 di: das16_di_rbits, 473 .di = das16_di_rbits,
474 do_: das16_do_wbits, 474 .do_ = das16_do_wbits,
475 i8255_offset:0, 475 .i8255_offset = 0,
476 i8254_offset:0x0c, 476 .i8254_offset = 0x0c,
477 size: 0x10, 477 .size = 0x10,
478 id: 0x00, 478 .id = 0x00,
479 }, 479 },
480 { 480 {
481 name: "cio-das16jr/16", /* cio-das16jr_16.pdf */ 481 .name = "cio-das16jr/16", /* cio-das16jr_16.pdf */
482 ai: das16_ai_rinsn, 482 .ai = das16_ai_rinsn,
483 ai_nbits:16, 483 .ai_nbits = 16,
484 ai_speed:10000, 484 .ai_speed = 10000,
485 ai_pg: das16_pg_16jr_16, 485 .ai_pg = das16_pg_16jr_16,
486 ao: NULL, 486 .ao = NULL,
487 di: das16_di_rbits, 487 .di = das16_di_rbits,
488 do_: das16_do_wbits, 488 .do_ = das16_do_wbits,
489 i8255_offset:0, 489 .i8255_offset = 0,
490 i8254_offset:0x0c, 490 .i8254_offset = 0x0c,
491 size: 0x10, 491 .size = 0x10,
492 id: 0x00, 492 .id = 0x00,
493 }, 493 },
494 { 494 {
495 name: "pc104-das16jr/16", /* pc104-das16jr_xx.pdf */ 495 .name = "pc104-das16jr/16", /* pc104-das16jr_xx.pdf */
496 ai: das16_ai_rinsn, 496 .ai = das16_ai_rinsn,
497 ai_nbits:16, 497 .ai_nbits = 16,
498 ai_speed:10000, 498 .ai_speed = 10000,
499 ai_pg: das16_pg_16jr_16, 499 .ai_pg = das16_pg_16jr_16,
500 ao: NULL, 500 .ao = NULL,
501 di: das16_di_rbits, 501 .di = das16_di_rbits,
502 do_: das16_do_wbits, 502 .do_ = das16_do_wbits,
503 i8255_offset:0, 503 .i8255_offset = 0,
504 i8254_offset:0x0c, 504 .i8254_offset = 0x0c,
505 size: 0x10, 505 .size = 0x10,
506 id: 0x00, 506 .id = 0x00,
507 }, 507 },
508 { 508 {
509 name: "das-1201", /* 4924.pdf (keithley user's manual) */ 509 .name = "das-1201", /* 4924.pdf (keithley user's manual) */
510 ai: das16_ai_rinsn, 510 .ai = das16_ai_rinsn,
511 ai_nbits:12, 511 .ai_nbits = 12,
512 ai_speed:20000, 512 .ai_speed = 20000,
513 ai_pg: das16_pg_none, 513 .ai_pg = das16_pg_none,
514 ao: NULL, 514 .ao = NULL,
515 di: das16_di_rbits, 515 .di = das16_di_rbits,
516 do_: das16_do_wbits, 516 .do_ = das16_do_wbits,
517 i8255_offset:0x400, 517 .i8255_offset = 0x400,
518 i8254_offset:0x0c, 518 .i8254_offset = 0x0c,
519 size: 0x408, 519 .size = 0x408,
520 id: 0x20, 520 .id = 0x20,
521 }, 521 },
522 { 522 {
523 name: "das-1202", /* 4924.pdf (keithley user's manual) */ 523 .name = "das-1202", /* 4924.pdf (keithley user's manual) */
524 ai: das16_ai_rinsn, 524 .ai = das16_ai_rinsn,
525 ai_nbits:12, 525 .ai_nbits = 12,
526 ai_speed:10000, 526 .ai_speed = 10000,
527 ai_pg: das16_pg_none, 527 .ai_pg = das16_pg_none,
528 ao: NULL, 528 .ao = NULL,
529 di: das16_di_rbits, 529 .di = das16_di_rbits,
530 do_: das16_do_wbits, 530 .do_ = das16_do_wbits,
531 i8255_offset:0x400, 531 .i8255_offset = 0x400,
532 i8254_offset:0x0c, 532 .i8254_offset = 0x0c,
533 size: 0x408, 533 .size = 0x408,
534 id: 0x20, 534 .id = 0x20,
535 }, 535 },
536 { 536 {
537 name: "das-1401", /* 4919.pdf and 4922.pdf (keithley user's manual) */ 537 .name = "das-1401", /* 4919.pdf and 4922.pdf (keithley user's manual) */
538 ai: das16_ai_rinsn, 538 .ai = das16_ai_rinsn,
539 ai_nbits:12, 539 .ai_nbits = 12,
540 ai_speed:10000, 540 .ai_speed = 10000,
541 ai_pg: das16_pg_1601, 541 .ai_pg = das16_pg_1601,
542 ao: NULL, 542 .ao = NULL,
543 di: das16_di_rbits, 543 .di = das16_di_rbits,
544 do_: das16_do_wbits, 544 .do_ = das16_do_wbits,
545 i8255_offset:0x0, 545 .i8255_offset = 0x0,
546 i8254_offset:0x0c, 546 .i8254_offset = 0x0c,
547 size: 0x408, 547 .size = 0x408,
548 id: 0xc0 /* 4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0 */ 548 .id = 0xc0 /* 4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0 */
549 }, 549 },
550 { 550 {
551 name: "das-1402", /* 4919.pdf and 4922.pdf (keithley user's manual) */ 551 .name = "das-1402", /* 4919.pdf and 4922.pdf (keithley user's manual) */
552 ai: das16_ai_rinsn, 552 .ai = das16_ai_rinsn,
553 ai_nbits:12, 553 .ai_nbits = 12,
554 ai_speed:10000, 554 .ai_speed = 10000,
555 ai_pg: das16_pg_1602, 555 .ai_pg = das16_pg_1602,
556 ao: NULL, 556 .ao = NULL,
557 di: das16_di_rbits, 557 .di = das16_di_rbits,
558 do_: das16_do_wbits, 558 .do_ = das16_do_wbits,
559 i8255_offset:0x0, 559 .i8255_offset = 0x0,
560 i8254_offset:0x0c, 560 .i8254_offset = 0x0c,
561 size: 0x408, 561 .size = 0x408,
562 id: 0xc0 /* 4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0 */ 562 .id = 0xc0 /* 4919.pdf says id bits are 0xe0, 4922.pdf says 0xc0 */
563 }, 563 },
564 { 564 {
565 name: "das-1601", /* 4919.pdf */ 565 .name = "das-1601", /* 4919.pdf */
566 ai: das16_ai_rinsn, 566 .ai = das16_ai_rinsn,
567 ai_nbits:12, 567 .ai_nbits = 12,
568 ai_speed:10000, 568 .ai_speed = 10000,
569 ai_pg: das16_pg_1601, 569 .ai_pg = das16_pg_1601,
570 ao: das16_ao_winsn, 570 .ao = das16_ao_winsn,
571 ao_nbits:12, 571 .ao_nbits = 12,
572 di: das16_di_rbits, 572 .di = das16_di_rbits,
573 do_: das16_do_wbits, 573 .do_ = das16_do_wbits,
574 i8255_offset:0x400, 574 .i8255_offset = 0x400,
575 i8254_offset:0x0c, 575 .i8254_offset = 0x0c,
576 size: 0x408, 576 .size = 0x408,
577 id: 0xc0}, 577 .id = 0xc0},
578 { 578 {
579 name: "das-1602", /* 4919.pdf */ 579 .name = "das-1602", /* 4919.pdf */
580 ai: das16_ai_rinsn, 580 .ai = das16_ai_rinsn,
581 ai_nbits:12, 581 .ai_nbits = 12,
582 ai_speed:10000, 582 .ai_speed = 10000,
583 ai_pg: das16_pg_1602, 583 .ai_pg = das16_pg_1602,
584 ao: das16_ao_winsn, 584 .ao = das16_ao_winsn,
585 ao_nbits:12, 585 .ao_nbits = 12,
586 di: das16_di_rbits, 586 .di = das16_di_rbits,
587 do_: das16_do_wbits, 587 .do_ = das16_do_wbits,
588 i8255_offset:0x400, 588 .i8255_offset = 0x400,
589 i8254_offset:0x0c, 589 .i8254_offset = 0x0c,
590 size: 0x408, 590 .size = 0x408,
591 id: 0xc0}, 591 .id = 0xc0},
592 { 592 {
593 name: "cio-das1401/12", /* cio-das1400_series.pdf */ 593 .name = "cio-das1401/12", /* cio-das1400_series.pdf */
594 ai: das16_ai_rinsn, 594 .ai = das16_ai_rinsn,
595 ai_nbits:12, 595 .ai_nbits = 12,
596 ai_speed:6250, 596 .ai_speed = 6250,
597 ai_pg: das16_pg_1601, 597 .ai_pg = das16_pg_1601,
598 ao: NULL, 598 .ao = NULL,
599 di: das16_di_rbits, 599 .di = das16_di_rbits,
600 do_: das16_do_wbits, 600 .do_ = das16_do_wbits,
601 i8255_offset:0, 601 .i8255_offset = 0,
602 i8254_offset:0x0c, 602 .i8254_offset = 0x0c,
603 size: 0x408, 603 .size = 0x408,
604 id: 0xc0}, 604 .id = 0xc0},
605 { 605 {
606 name: "cio-das1402/12", /* cio-das1400_series.pdf */ 606 .name = "cio-das1402/12", /* cio-das1400_series.pdf */
607 ai: das16_ai_rinsn, 607 .ai = das16_ai_rinsn,
608 ai_nbits:12, 608 .ai_nbits = 12,
609 ai_speed:6250, 609 .ai_speed = 6250,
610 ai_pg: das16_pg_1602, 610 .ai_pg = das16_pg_1602,
611 ao: NULL, 611 .ao = NULL,
612 di: das16_di_rbits, 612 .di = das16_di_rbits,
613 do_: das16_do_wbits, 613 .do_ = das16_do_wbits,
614 i8255_offset:0, 614 .i8255_offset = 0,
615 i8254_offset:0x0c, 615 .i8254_offset = 0x0c,
616 size: 0x408, 616 .size = 0x408,
617 id: 0xc0}, 617 .id = 0xc0},
618 { 618 {
619 name: "cio-das1402/16", /* cio-das1400_series.pdf */ 619 .name = "cio-das1402/16", /* cio-das1400_series.pdf */
620 ai: das16_ai_rinsn, 620 .ai = das16_ai_rinsn,
621 ai_nbits:16, 621 .ai_nbits = 16,
622 ai_speed:10000, 622 .ai_speed = 10000,
623 ai_pg: das16_pg_1602, 623 .ai_pg = das16_pg_1602,
624 ao: NULL, 624 .ao = NULL,
625 di: das16_di_rbits, 625 .di = das16_di_rbits,
626 do_: das16_do_wbits, 626 .do_ = das16_do_wbits,
627 i8255_offset:0, 627 .i8255_offset = 0,
628 i8254_offset:0x0c, 628 .i8254_offset = 0x0c,
629 size: 0x408, 629 .size = 0x408,
630 id: 0xc0}, 630 .id = 0xc0},
631 { 631 {
632 name: "cio-das1601/12", /* cio-das160x-1x.pdf */ 632 .name = "cio-das1601/12", /* cio-das160x-1x.pdf */
633 ai: das16_ai_rinsn, 633 .ai = das16_ai_rinsn,
634 ai_nbits:12, 634 .ai_nbits = 12,
635 ai_speed:6250, 635 .ai_speed = 6250,
636 ai_pg: das16_pg_1601, 636 .ai_pg = das16_pg_1601,
637 ao: das16_ao_winsn, 637 .ao = das16_ao_winsn,
638 ao_nbits:12, 638 .ao_nbits = 12,
639 di: das16_di_rbits, 639 .di = das16_di_rbits,
640 do_: das16_do_wbits, 640 .do_ = das16_do_wbits,
641 i8255_offset:0x400, 641 .i8255_offset = 0x400,
642 i8254_offset:0x0c, 642 .i8254_offset = 0x0c,
643 size: 0x408, 643 .size = 0x408,
644 id: 0xc0}, 644 .id = 0xc0},
645 { 645 {
646 name: "cio-das1602/12", /* cio-das160x-1x.pdf */ 646 .name = "cio-das1602/12", /* cio-das160x-1x.pdf */
647 ai: das16_ai_rinsn, 647 .ai = das16_ai_rinsn,
648 ai_nbits:12, 648 .ai_nbits = 12,
649 ai_speed:10000, 649 .ai_speed = 10000,
650 ai_pg: das16_pg_1602, 650 .ai_pg = das16_pg_1602,
651 ao: das16_ao_winsn, 651 .ao = das16_ao_winsn,
652 ao_nbits:12, 652 .ao_nbits = 12,
653 di: das16_di_rbits, 653 .di = das16_di_rbits,
654 do_: das16_do_wbits, 654 .do_ = das16_do_wbits,
655 i8255_offset:0x400, 655 .i8255_offset = 0x400,
656 i8254_offset:0x0c, 656 .i8254_offset = 0x0c,
657 size: 0x408, 657 .size = 0x408,
658 id: 0xc0}, 658 .id = 0xc0},
659 { 659 {
660 name: "cio-das1602/16", /* cio-das160x-1x.pdf */ 660 .name = "cio-das1602/16", /* cio-das160x-1x.pdf */
661 ai: das16_ai_rinsn, 661 .ai = das16_ai_rinsn,
662 ai_nbits:16, 662 .ai_nbits = 16,
663 ai_speed:10000, 663 .ai_speed = 10000,
664 ai_pg: das16_pg_1602, 664 .ai_pg = das16_pg_1602,
665 ao: das16_ao_winsn, 665 .ao = das16_ao_winsn,
666 ao_nbits:12, 666 .ao_nbits = 12,
667 di: das16_di_rbits, 667 .di = das16_di_rbits,
668 do_: das16_do_wbits, 668 .do_ = das16_do_wbits,
669 i8255_offset:0x400, 669 .i8255_offset = 0x400,
670 i8254_offset:0x0c, 670 .i8254_offset = 0x0c,
671 size: 0x408, 671 .size = 0x408,
672 id: 0xc0}, 672 .id = 0xc0},
673 { 673 {
674 name: "cio-das16/330", /* ? */ 674 .name = "cio-das16/330", /* ? */
675 ai: das16_ai_rinsn, 675 .ai = das16_ai_rinsn,
676 ai_nbits:12, 676 .ai_nbits = 12,
677 ai_speed:3030, 677 .ai_speed = 3030,
678 ai_pg: das16_pg_16jr, 678 .ai_pg = das16_pg_16jr,
679 ao: NULL, 679 .ao = NULL,
680 di: das16_di_rbits, 680 .di = das16_di_rbits,
681 do_: das16_do_wbits, 681 .do_ = das16_do_wbits,
682 i8255_offset:0, 682 .i8255_offset = 0,
683 i8254_offset:0x0c, 683 .i8254_offset = 0x0c,
684 size: 0x14, 684 .size = 0x14,
685 id: 0xf0}, 685 .id = 0xf0},
686#if 0 686#if 0
687 { 687 {
688 name: "das16/330i", /* ? */ 688 .name = "das16/330i", /* ? */
689 }, 689 },
690 { 690 {
691 name: "das16/jr/ctr5", /* ? */ 691 .name = "das16/jr/ctr5", /* ? */
692 }, 692 },
693 { 693 {
694 name: "cio-das16/m1/16", /* cio-das16_m1_16.pdf, this board is a bit quirky, no dma */ 694 .name = "cio-das16/m1/16", /* cio-das16_m1_16.pdf, this board is a bit quirky, no dma */
695 }, 695 },
696#endif 696#endif
697}; 697};
@@ -701,13 +701,13 @@ static const struct das16_board das16_boards[] = {
701static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it); 701static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it);
702static int das16_detach(struct comedi_device *dev); 702static int das16_detach(struct comedi_device *dev);
703static struct comedi_driver driver_das16 = { 703static struct comedi_driver driver_das16 = {
704 driver_name:"das16", 704 .driver_name = "das16",
705 module:THIS_MODULE, 705 .module = THIS_MODULE,
706 attach:das16_attach, 706 .attach = das16_attach,
707 detach:das16_detach, 707 .detach = das16_detach,
708 board_name:&das16_boards[0].name, 708 .board_name = &das16_boards[0].name,
709 num_names:n_das16_boards, 709 .num_names = n_das16_boards,
710 offset:sizeof(das16_boards[0]), 710 .offset = sizeof(das16_boards[0]),
711}; 711};
712 712
713#define DAS16_TIMEOUT 1000 713#define DAS16_TIMEOUT 1000
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index 00aa30471cf..031d6307c09 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -159,8 +159,8 @@ struct das16m1_board {
159 159
160static const struct das16m1_board das16m1_boards[] = { 160static const struct das16m1_board das16m1_boards[] = {
161 { 161 {
162 name: "cio-das16/m1", /* CIO-DAS16_M1.pdf */ 162 .name = "cio-das16/m1", /* CIO-DAS16_M1.pdf */
163 ai_speed:1000, /* 1MHz max speed */ 163 .ai_speed = 1000, /* 1MHz max speed */
164 }, 164 },
165}; 165};
166 166
@@ -169,13 +169,13 @@ static const struct das16m1_board das16m1_boards[] = {
169static int das16m1_attach(struct comedi_device *dev, struct comedi_devconfig *it); 169static int das16m1_attach(struct comedi_device *dev, struct comedi_devconfig *it);
170static int das16m1_detach(struct comedi_device *dev); 170static int das16m1_detach(struct comedi_device *dev);
171static struct comedi_driver driver_das16m1 = { 171static struct comedi_driver driver_das16m1 = {
172 driver_name:"das16m1", 172 .driver_name = "das16m1",
173 module:THIS_MODULE, 173 .module = THIS_MODULE,
174 attach:das16m1_attach, 174 .attach = das16m1_attach,
175 detach:das16m1_detach, 175 .detach = das16m1_detach,
176 board_name:&das16m1_boards[0].name, 176 .board_name = &das16m1_boards[0].name,
177 num_names:das16m1_num_boards, 177 .num_names = das16m1_num_boards,
178 offset:sizeof(das16m1_boards[0]), 178 .offset = sizeof(das16m1_boards[0]),
179}; 179};
180 180
181struct das16m1_private_struct { 181struct das16m1_private_struct {
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 2112783d37e..b420e7649bc 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -259,202 +259,202 @@ struct das1800_board {
259 */ 259 */
260static const struct das1800_board das1800_boards[] = { 260static const struct das1800_board das1800_boards[] = {
261 { 261 {
262 name: "das-1701st", 262 .name = "das-1701st",
263 ai_speed:6250, 263 .ai_speed = 6250,
264 resolution:12, 264 .resolution = 12,
265 qram_len:256, 265 .qram_len = 256,
266 common: 1, 266 .common = 1,
267 do_n_chan:4, 267 .do_n_chan = 4,
268 ao_ability:0, 268 .ao_ability = 0,
269 ao_n_chan:0, 269 .ao_n_chan = 0,
270 range_ai:&range_ai_das1801, 270 .range_ai = &range_ai_das1801,
271 }, 271 },
272 { 272 {
273 name: "das-1701st-da", 273 .name = "das-1701st-da",
274 ai_speed:6250, 274 .ai_speed = 6250,
275 resolution:12, 275 .resolution = 12,
276 qram_len:256, 276 .qram_len = 256,
277 common: 1, 277 .common = 1,
278 do_n_chan:4, 278 .do_n_chan = 4,
279 ao_ability:1, 279 .ao_ability = 1,
280 ao_n_chan:4, 280 .ao_n_chan = 4,
281 range_ai:&range_ai_das1801, 281 .range_ai = &range_ai_das1801,
282 }, 282 },
283 { 283 {
284 name: "das-1702st", 284 .name = "das-1702st",
285 ai_speed:6250, 285 .ai_speed = 6250,
286 resolution:12, 286 .resolution = 12,
287 qram_len:256, 287 .qram_len = 256,
288 common: 1, 288 .common = 1,
289 do_n_chan:4, 289 .do_n_chan = 4,
290 ao_ability:0, 290 .ao_ability = 0,
291 ao_n_chan:0, 291 .ao_n_chan = 0,
292 range_ai:&range_ai_das1802, 292 .range_ai = &range_ai_das1802,
293 }, 293 },
294 { 294 {
295 name: "das-1702st-da", 295 .name = "das-1702st-da",
296 ai_speed:6250, 296 .ai_speed = 6250,
297 resolution:12, 297 .resolution = 12,
298 qram_len:256, 298 .qram_len = 256,
299 common: 1, 299 .common = 1,
300 do_n_chan:4, 300 .do_n_chan = 4,
301 ao_ability:1, 301 .ao_ability = 1,
302 ao_n_chan:4, 302 .ao_n_chan = 4,
303 range_ai:&range_ai_das1802, 303 .range_ai = &range_ai_das1802,
304 }, 304 },
305 { 305 {
306 name: "das-1702hr", 306 .name = "das-1702hr",
307 ai_speed:20000, 307 .ai_speed = 20000,
308 resolution:16, 308 .resolution = 16,
309 qram_len:256, 309 .qram_len = 256,
310 common: 1, 310 .common = 1,
311 do_n_chan:4, 311 .do_n_chan = 4,
312 ao_ability:0, 312 .ao_ability = 0,
313 ao_n_chan:0, 313 .ao_n_chan = 0,
314 range_ai:&range_ai_das1802, 314 .range_ai = &range_ai_das1802,
315 }, 315 },
316 { 316 {
317 name: "das-1702hr-da", 317 .name = "das-1702hr-da",
318 ai_speed:20000, 318 .ai_speed = 20000,
319 resolution:16, 319 .resolution = 16,
320 qram_len:256, 320 .qram_len = 256,
321 common: 1, 321 .common = 1,
322 do_n_chan:4, 322 .do_n_chan = 4,
323 ao_ability:1, 323 .ao_ability = 1,
324 ao_n_chan:2, 324 .ao_n_chan = 2,
325 range_ai:&range_ai_das1802, 325 .range_ai = &range_ai_das1802,
326 }, 326 },
327 { 327 {
328 name: "das-1701ao", 328 .name = "das-1701ao",
329 ai_speed:6250, 329 .ai_speed = 6250,
330 resolution:12, 330 .resolution = 12,
331 qram_len:256, 331 .qram_len = 256,
332 common: 1, 332 .common = 1,
333 do_n_chan:4, 333 .do_n_chan = 4,
334 ao_ability:2, 334 .ao_ability = 2,
335 ao_n_chan:2, 335 .ao_n_chan = 2,
336 range_ai:&range_ai_das1801, 336 .range_ai = &range_ai_das1801,
337 }, 337 },
338 { 338 {
339 name: "das-1702ao", 339 .name = "das-1702ao",
340 ai_speed:6250, 340 .ai_speed = 6250,
341 resolution:12, 341 .resolution = 12,
342 qram_len:256, 342 .qram_len = 256,
343 common: 1, 343 .common = 1,
344 do_n_chan:4, 344 .do_n_chan = 4,
345 ao_ability:2, 345 .ao_ability = 2,
346 ao_n_chan:2, 346 .ao_n_chan = 2,
347 range_ai:&range_ai_das1802, 347 .range_ai = &range_ai_das1802,
348 }, 348 },
349 { 349 {
350 name: "das-1801st", 350 .name = "das-1801st",
351 ai_speed:3000, 351 .ai_speed = 3000,
352 resolution:12, 352 .resolution = 12,
353 qram_len:256, 353 .qram_len = 256,
354 common: 1, 354 .common = 1,
355 do_n_chan:4, 355 .do_n_chan = 4,
356 ao_ability:0, 356 .ao_ability = 0,
357 ao_n_chan:0, 357 .ao_n_chan = 0,
358 range_ai:&range_ai_das1801, 358 .range_ai = &range_ai_das1801,
359 }, 359 },
360 { 360 {
361 name: "das-1801st-da", 361 .name = "das-1801st-da",
362 ai_speed:3000, 362 .ai_speed = 3000,
363 resolution:12, 363 .resolution = 12,
364 qram_len:256, 364 .qram_len = 256,
365 common: 1, 365 .common = 1,
366 do_n_chan:4, 366 .do_n_chan = 4,
367 ao_ability:0, 367 .ao_ability = 0,
368 ao_n_chan:4, 368 .ao_n_chan = 4,
369 range_ai:&range_ai_das1801, 369 .range_ai = &range_ai_das1801,
370 }, 370 },
371 { 371 {
372 name: "das-1802st", 372 .name = "das-1802st",
373 ai_speed:3000, 373 .ai_speed = 3000,
374 resolution:12, 374 .resolution = 12,
375 qram_len:256, 375 .qram_len = 256,
376 common: 1, 376 .common = 1,
377 do_n_chan:4, 377 .do_n_chan = 4,
378 ao_ability:0, 378 .ao_ability = 0,
379 ao_n_chan:0, 379 .ao_n_chan = 0,
380 range_ai:&range_ai_das1802, 380 .range_ai = &range_ai_das1802,
381 }, 381 },
382 { 382 {
383 name: "das-1802st-da", 383 .name = "das-1802st-da",
384 ai_speed:3000, 384 .ai_speed = 3000,
385 resolution:12, 385 .resolution = 12,
386 qram_len:256, 386 .qram_len = 256,
387 common: 1, 387 .common = 1,
388 do_n_chan:4, 388 .do_n_chan = 4,
389 ao_ability:1, 389 .ao_ability = 1,
390 ao_n_chan:4, 390 .ao_n_chan = 4,
391 range_ai:&range_ai_das1802, 391 .range_ai = &range_ai_das1802,
392 }, 392 },
393 { 393 {
394 name: "das-1802hr", 394 .name = "das-1802hr",
395 ai_speed:10000, 395 .ai_speed = 10000,
396 resolution:16, 396 .resolution = 16,
397 qram_len:256, 397 .qram_len = 256,
398 common: 1, 398 .common = 1,
399 do_n_chan:4, 399 .do_n_chan = 4,
400 ao_ability:0, 400 .ao_ability = 0,
401 ao_n_chan:0, 401 .ao_n_chan = 0,
402 range_ai:&range_ai_das1802, 402 .range_ai = &range_ai_das1802,
403 }, 403 },
404 { 404 {
405 name: "das-1802hr-da", 405 .name = "das-1802hr-da",
406 ai_speed:10000, 406 .ai_speed = 10000,
407 resolution:16, 407 .resolution = 16,
408 qram_len:256, 408 .qram_len = 256,
409 common: 1, 409 .common = 1,
410 do_n_chan:4, 410 .do_n_chan = 4,
411 ao_ability:1, 411 .ao_ability = 1,
412 ao_n_chan:2, 412 .ao_n_chan = 2,
413 range_ai:&range_ai_das1802, 413 .range_ai = &range_ai_das1802,
414 }, 414 },
415 { 415 {
416 name: "das-1801hc", 416 .name = "das-1801hc",
417 ai_speed:3000, 417 .ai_speed = 3000,
418 resolution:12, 418 .resolution = 12,
419 qram_len:64, 419 .qram_len = 64,
420 common: 0, 420 .common = 0,
421 do_n_chan:8, 421 .do_n_chan = 8,
422 ao_ability:1, 422 .ao_ability = 1,
423 ao_n_chan:2, 423 .ao_n_chan = 2,
424 range_ai:&range_ai_das1801, 424 .range_ai = &range_ai_das1801,
425 }, 425 },
426 { 426 {
427 name: "das-1802hc", 427 .name = "das-1802hc",
428 ai_speed:3000, 428 .ai_speed = 3000,
429 resolution:12, 429 .resolution = 12,
430 qram_len:64, 430 .qram_len = 64,
431 common: 0, 431 .common = 0,
432 do_n_chan:8, 432 .do_n_chan = 8,
433 ao_ability:1, 433 .ao_ability = 1,
434 ao_n_chan:2, 434 .ao_n_chan = 2,
435 range_ai:&range_ai_das1802, 435 .range_ai = &range_ai_das1802,
436 }, 436 },
437 { 437 {
438 name: "das-1801ao", 438 .name = "das-1801ao",
439 ai_speed:3000, 439 .ai_speed = 3000,
440 resolution:12, 440 .resolution = 12,
441 qram_len:256, 441 .qram_len = 256,
442 common: 1, 442 .common = 1,
443 do_n_chan:4, 443 .do_n_chan = 4,
444 ao_ability:2, 444 .ao_ability = 2,
445 ao_n_chan:2, 445 .ao_n_chan = 2,
446 range_ai:&range_ai_das1801, 446 .range_ai = &range_ai_das1801,
447 }, 447 },
448 { 448 {
449 name: "das-1802ao", 449 .name = "das-1802ao",
450 ai_speed:3000, 450 .ai_speed = 3000,
451 resolution:12, 451 .resolution = 12,
452 qram_len:256, 452 .qram_len = 256,
453 common: 1, 453 .common = 1,
454 do_n_chan:4, 454 .do_n_chan = 4,
455 ao_ability:2, 455 .ao_ability = 2,
456 ao_n_chan:2, 456 .ao_n_chan = 2,
457 range_ai:&range_ai_das1802, 457 .range_ai = &range_ai_das1802,
458 }, 458 },
459}; 459};
460 460
@@ -505,13 +505,13 @@ static const struct comedi_lrange range_ao_2 = {
505*/ 505*/
506 506
507static struct comedi_driver driver_das1800 = { 507static struct comedi_driver driver_das1800 = {
508 driver_name:"das1800", 508 .driver_name = "das1800",
509 module:THIS_MODULE, 509 .module = THIS_MODULE,
510 attach:das1800_attach, 510 .attach = das1800_attach,
511 detach:das1800_detach, 511 .detach = das1800_detach,
512 num_names:sizeof(das1800_boards) / sizeof(struct das1800_board), 512 .num_names = sizeof(das1800_boards) / sizeof(struct das1800_board),
513 board_name:&das1800_boards[0].name, 513 .board_name = &das1800_boards[0].name,
514 offset:sizeof(struct das1800_board), 514 .offset = sizeof(struct das1800_board),
515}; 515};
516 516
517/* 517/*
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index 9b43f873284..950f07a56f4 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -101,10 +101,10 @@ This driver has suffered bitrot.
101static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it); 101static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it);
102static int das6402_detach(struct comedi_device *dev); 102static int das6402_detach(struct comedi_device *dev);
103static struct comedi_driver driver_das6402 = { 103static struct comedi_driver driver_das6402 = {
104 driver_name:"das6402", 104 .driver_name = "das6402",
105 module:THIS_MODULE, 105 .module = THIS_MODULE,
106 attach:das6402_attach, 106 .attach = das6402_attach,
107 detach:das6402_detach, 107 .detach = das6402_detach,
108}; 108};
109 109
110COMEDI_INITCLEANUP(driver_das6402); 110COMEDI_INITCLEANUP(driver_das6402);
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index aa1ae24da84..71aeae3d57a 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -184,46 +184,46 @@ enum { das800, ciodas800, das801, ciodas801, das802, ciodas802, ciodas80216 };
184 184
185static const struct das800_board das800_boards[] = { 185static const struct das800_board das800_boards[] = {
186 { 186 {
187 name: "das-800", 187 .name = "das-800",
188 ai_speed:25000, 188 .ai_speed = 25000,
189 ai_range:&range_das800_ai, 189 .ai_range = &range_das800_ai,
190 resolution:12, 190 .resolution = 12,
191 }, 191 },
192 { 192 {
193 name: "cio-das800", 193 .name = "cio-das800",
194 ai_speed:20000, 194 .ai_speed = 20000,
195 ai_range:&range_das800_ai, 195 .ai_range = &range_das800_ai,
196 resolution:12, 196 .resolution = 12,
197 }, 197 },
198 { 198 {
199 name: "das-801", 199 .name = "das-801",
200 ai_speed:25000, 200 .ai_speed = 25000,
201 ai_range:&range_das801_ai, 201 .ai_range = &range_das801_ai,
202 resolution:12, 202 .resolution = 12,
203 }, 203 },
204 { 204 {
205 name: "cio-das801", 205 .name = "cio-das801",
206 ai_speed:20000, 206 .ai_speed = 20000,
207 ai_range:&range_cio_das801_ai, 207 .ai_range = &range_cio_das801_ai,
208 resolution:12, 208 .resolution = 12,
209 }, 209 },
210 { 210 {
211 name: "das-802", 211 .name = "das-802",
212 ai_speed:25000, 212 .ai_speed = 25000,
213 ai_range:&range_das802_ai, 213 .ai_range = &range_das802_ai,
214 resolution:12, 214 .resolution = 12,
215 }, 215 },
216 { 216 {
217 name: "cio-das802", 217 .name = "cio-das802",
218 ai_speed:20000, 218 .ai_speed = 20000,
219 ai_range:&range_das802_ai, 219 .ai_range = &range_das802_ai,
220 resolution:12, 220 .resolution = 12,
221 }, 221 },
222 { 222 {
223 name: "cio-das802/16", 223 .name = "cio-das802/16",
224 ai_speed:10000, 224 .ai_speed = 10000,
225 ai_range:&range_das80216_ai, 225 .ai_range = &range_das80216_ai,
226 resolution:16, 226 .resolution = 16,
227 }, 227 },
228}; 228};
229 229
@@ -247,13 +247,13 @@ static int das800_detach(struct comedi_device *dev);
247static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s); 247static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
248 248
249static struct comedi_driver driver_das800 = { 249static struct comedi_driver driver_das800 = {
250 driver_name:"das800", 250 .driver_name = "das800",
251 module:THIS_MODULE, 251 .module = THIS_MODULE,
252 attach:das800_attach, 252 .attach = das800_attach,
253 detach:das800_detach, 253 .detach = das800_detach,
254 num_names:sizeof(das800_boards) / sizeof(struct das800_board), 254 .num_names = sizeof(das800_boards) / sizeof(struct das800_board),
255 board_name:&das800_boards[0].name, 255 .board_name = &das800_boards[0].name,
256 offset:sizeof(struct das800_board), 256 .offset = sizeof(struct das800_board),
257}; 257};
258 258
259static irqreturn_t das800_interrupt(int irq, void *d); 259static irqreturn_t das800_interrupt(int irq, void *d);
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index a8c0603d0d9..ce53d161a69 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -213,15 +213,15 @@ struct dmm32at_board {
213}; 213};
214static const struct dmm32at_board dmm32at_boards[] = { 214static const struct dmm32at_board dmm32at_boards[] = {
215 { 215 {
216 name: "dmm32at", 216 .name = "dmm32at",
217 ai_chans:32, 217 .ai_chans = 32,
218 ai_bits: 16, 218 .ai_bits = 16,
219 ai_ranges:&dmm32at_airanges, 219 .ai_ranges = &dmm32at_airanges,
220 ao_chans:4, 220 .ao_chans = 4,
221 ao_bits: 12, 221 .ao_bits = 12,
222 ao_ranges:&dmm32at_aoranges, 222 .ao_ranges = &dmm32at_aoranges,
223 have_dio:1, 223 .have_dio = 1,
224 dio_chans:24, 224 .dio_chans = 24,
225 }, 225 },
226}; 226};
227 227
@@ -261,10 +261,10 @@ struct dmm32at_private {
261static int dmm32at_attach(struct comedi_device *dev, struct comedi_devconfig *it); 261static int dmm32at_attach(struct comedi_device *dev, struct comedi_devconfig *it);
262static int dmm32at_detach(struct comedi_device *dev); 262static int dmm32at_detach(struct comedi_device *dev);
263static struct comedi_driver driver_dmm32at = { 263static struct comedi_driver driver_dmm32at = {
264 driver_name:"dmm32at", 264 .driver_name = "dmm32at",
265 module:THIS_MODULE, 265 .module = THIS_MODULE,
266 attach:dmm32at_attach, 266 .attach = dmm32at_attach,
267 detach:dmm32at_detach, 267 .detach = dmm32at_detach,
268/* It is not necessary to implement the following members if you are 268/* It is not necessary to implement the following members if you are
269 * writing a driver for a ISA PnP or PCI card */ 269 * writing a driver for a ISA PnP or PCI card */
270/* Most drivers will support multiple types of boards by 270/* Most drivers will support multiple types of boards by
@@ -283,9 +283,9 @@ static struct comedi_driver driver_dmm32at = {
283 * the type of board in software. ISA PnP, PCI, and PCMCIA 283 * the type of board in software. ISA PnP, PCI, and PCMCIA
284 * devices are such boards. 284 * devices are such boards.
285 */ 285 */
286 board_name:&dmm32at_boards[0].name, 286 .board_name = &dmm32at_boards[0].name,
287 offset:sizeof(struct dmm32at_board), 287 .offset = sizeof(struct dmm32at_board),
288 num_names:sizeof(dmm32at_boards) / sizeof(struct dmm32at_board), 288 .num_names = sizeof(dmm32at_boards) / sizeof(struct dmm32at_board),
289}; 289};
290 290
291/* prototypes for driver functions below */ 291/* prototypes for driver functions below */
diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c
index 29fea1ac8ff..335e3a0660c 100644
--- a/drivers/staging/comedi/drivers/dt2801.c
+++ b/drivers/staging/comedi/drivers/dt2801.c
@@ -91,10 +91,10 @@ Configuration options:
91static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it); 91static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it);
92static int dt2801_detach(struct comedi_device *dev); 92static int dt2801_detach(struct comedi_device *dev);
93static struct comedi_driver driver_dt2801 = { 93static struct comedi_driver driver_dt2801 = {
94 driver_name:"dt2801", 94 .driver_name = "dt2801",
95 module:THIS_MODULE, 95 .module = THIS_MODULE,
96 attach:dt2801_attach, 96 .attach = dt2801_attach,
97 detach:dt2801_detach, 97 .detach = dt2801_detach,
98}; 98};
99 99
100COMEDI_INITCLEANUP(driver_dt2801); 100COMEDI_INITCLEANUP(driver_dt2801);
@@ -152,69 +152,69 @@ struct dt2801_board {
152 */ 152 */
153static const struct dt2801_board boardtypes[] = { 153static const struct dt2801_board boardtypes[] = {
154 { 154 {
155 name: "dt2801", 155 .name = "dt2801",
156 boardcode:0x09, 156 .boardcode = 0x09,
157 ad_diff: 2, 157 .ad_diff = 2,
158 ad_chan: 16, 158 .ad_chan = 16,
159 adbits: 12, 159 .adbits = 12,
160 adrangetype:0, 160 .adrangetype = 0,
161 dabits: 12}, 161 .dabits = 12},
162 { 162 {
163 name: "dt2801-a", 163 .name = "dt2801-a",
164 boardcode:0x52, 164 .boardcode = 0x52,
165 ad_diff: 2, 165 .ad_diff = 2,
166 ad_chan: 16, 166 .ad_chan = 16,
167 adbits: 12, 167 .adbits = 12,
168 adrangetype:0, 168 .adrangetype = 0,
169 dabits: 12}, 169 .dabits = 12},
170 { 170 {
171 name: "dt2801/5716a", 171 .name = "dt2801/5716a",
172 boardcode:0x82, 172 .boardcode = 0x82,
173 ad_diff: 1, 173 .ad_diff = 1,
174 ad_chan: 16, 174 .ad_chan = 16,
175 adbits: 16, 175 .adbits = 16,
176 adrangetype:1, 176 .adrangetype = 1,
177 dabits: 12}, 177 .dabits = 12},
178 { 178 {
179 name: "dt2805", 179 .name = "dt2805",
180 boardcode:0x12, 180 .boardcode = 0x12,
181 ad_diff: 1, 181 .ad_diff = 1,
182 ad_chan: 16, 182 .ad_chan = 16,
183 adbits: 12, 183 .adbits = 12,
184 adrangetype:0, 184 .adrangetype = 0,
185 dabits: 12}, 185 .dabits = 12},
186 { 186 {
187 name: "dt2805/5716a", 187 .name = "dt2805/5716a",
188 boardcode:0x92, 188 .boardcode = 0x92,
189 ad_diff: 1, 189 .ad_diff = 1,
190 ad_chan: 16, 190 .ad_chan = 16,
191 adbits: 16, 191 .adbits = 16,
192 adrangetype:1, 192 .adrangetype = 1,
193 dabits: 12}, 193 .dabits = 12},
194 { 194 {
195 name: "dt2808", 195 .name = "dt2808",
196 boardcode:0x20, 196 .boardcode = 0x20,
197 ad_diff: 0, 197 .ad_diff = 0,
198 ad_chan: 16, 198 .ad_chan = 16,
199 adbits: 12, 199 .adbits = 12,
200 adrangetype:2, 200 .adrangetype = 2,
201 dabits: 8}, 201 .dabits = 8},
202 { 202 {
203 name: "dt2818", 203 .name = "dt2818",
204 boardcode:0xa2, 204 .boardcode = 0xa2,
205 ad_diff: 0, 205 .ad_diff = 0,
206 ad_chan: 4, 206 .ad_chan = 4,
207 adbits: 12, 207 .adbits = 12,
208 adrangetype:0, 208 .adrangetype = 0,
209 dabits: 12}, 209 .dabits = 12},
210 { 210 {
211 name: "dt2809", 211 .name = "dt2809",
212 boardcode:0xb0, 212 .boardcode = 0xb0,
213 ad_diff: 0, 213 .ad_diff = 0,
214 ad_chan: 8, 214 .ad_chan = 8,
215 adbits: 12, 215 .adbits = 12,
216 adrangetype:1, 216 .adrangetype = 1,
217 dabits: 12}, 217 .dabits = 12},
218}; 218};
219 219
220#define n_boardtypes ((sizeof(boardtypes))/(sizeof(boardtypes[0]))) 220#define n_boardtypes ((sizeof(boardtypes))/(sizeof(boardtypes[0])))
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index b782118ebff..7e6995ed886 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -217,13 +217,13 @@ static const struct dt2811_board boardtypes[] = {
217static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it); 217static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it);
218static int dt2811_detach(struct comedi_device *dev); 218static int dt2811_detach(struct comedi_device *dev);
219static struct comedi_driver driver_dt2811 = { 219static struct comedi_driver driver_dt2811 = {
220 driver_name:"dt2811", 220 .driver_name = "dt2811",
221 module:THIS_MODULE, 221 .module = THIS_MODULE,
222 attach:dt2811_attach, 222 .attach = dt2811_attach,
223 detach:dt2811_detach, 223 .detach = dt2811_detach,
224 board_name:&boardtypes[0].name, 224 .board_name = &boardtypes[0].name,
225 num_names:sizeof(boardtypes) / sizeof(struct dt2811_board), 225 .num_names = sizeof(boardtypes) / sizeof(struct dt2811_board),
226 offset:sizeof(struct dt2811_board), 226 .offset = sizeof(struct dt2811_board),
227}; 227};
228 228
229COMEDI_INITCLEANUP(driver_dt2811); 229COMEDI_INITCLEANUP(driver_dt2811);
diff --git a/drivers/staging/comedi/drivers/dt2814.c b/drivers/staging/comedi/drivers/dt2814.c
index 4db82ae6bfb..246d0d74ce9 100644
--- a/drivers/staging/comedi/drivers/dt2814.c
+++ b/drivers/staging/comedi/drivers/dt2814.c
@@ -62,10 +62,10 @@ addition, the clock does not seem to be very accurate.
62static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it); 62static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it);
63static int dt2814_detach(struct comedi_device *dev); 63static int dt2814_detach(struct comedi_device *dev);
64static struct comedi_driver driver_dt2814 = { 64static struct comedi_driver driver_dt2814 = {
65 driver_name:"dt2814", 65 .driver_name = "dt2814",
66 module:THIS_MODULE, 66 .module = THIS_MODULE,
67 attach:dt2814_attach, 67 .attach = dt2814_attach,
68 detach:dt2814_detach, 68 .detach = dt2814_detach,
69}; 69};
70 70
71COMEDI_INITCLEANUP(driver_dt2814); 71COMEDI_INITCLEANUP(driver_dt2814);
diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c
index 36a2f07792b..d83ee4acbb1 100644
--- a/drivers/staging/comedi/drivers/dt2815.c
+++ b/drivers/staging/comedi/drivers/dt2815.c
@@ -78,10 +78,10 @@ static const struct comedi_lrange range_dt2815_ao_20_current = { 1, {
78static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it); 78static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it);
79static int dt2815_detach(struct comedi_device *dev); 79static int dt2815_detach(struct comedi_device *dev);
80static struct comedi_driver driver_dt2815 = { 80static struct comedi_driver driver_dt2815 = {
81 driver_name:"dt2815", 81 .driver_name = "dt2815",
82 module:THIS_MODULE, 82 .module = THIS_MODULE,
83 attach:dt2815_attach, 83 .attach = dt2815_attach,
84 detach:dt2815_detach, 84 .detach = dt2815_detach,
85}; 85};
86 86
87COMEDI_INITCLEANUP(driver_dt2815); 87COMEDI_INITCLEANUP(driver_dt2815);
diff --git a/drivers/staging/comedi/drivers/dt2817.c b/drivers/staging/comedi/drivers/dt2817.c
index 7e944c544fa..b36f85632f8 100644
--- a/drivers/staging/comedi/drivers/dt2817.c
+++ b/drivers/staging/comedi/drivers/dt2817.c
@@ -50,10 +50,10 @@ Configuration options:
50static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it); 50static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it);
51static int dt2817_detach(struct comedi_device *dev); 51static int dt2817_detach(struct comedi_device *dev);
52static struct comedi_driver driver_dt2817 = { 52static struct comedi_driver driver_dt2817 = {
53 driver_name:"dt2817", 53 .driver_name = "dt2817",
54 module:THIS_MODULE, 54 .module = THIS_MODULE,
55 attach:dt2817_attach, 55 .attach = dt2817_attach,
56 detach:dt2817_detach, 56 .detach = dt2817_detach,
57}; 57};
58 58
59COMEDI_INITCLEANUP(driver_dt2817); 59COMEDI_INITCLEANUP(driver_dt2817);
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index 64e9c4b32c0..f852b934702 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -209,132 +209,132 @@ struct dt282x_board {
209}; 209};
210 210
211static const struct dt282x_board boardtypes[] = { 211static const struct dt282x_board boardtypes[] = {
212 {name:"dt2821", 212 {.name = "dt2821",
213 adbits: 12, 213 .adbits = 12,
214 adchan_se:16, 214 .adchan_se = 16,
215 adchan_di:8, 215 .adchan_di = 8,
216 ai_speed:20000, 216 .ai_speed = 20000,
217 ispgl: 0, 217 .ispgl = 0,
218 dachan: 2, 218 .dachan = 2,
219 dabits: 12, 219 .dabits = 12,
220 }, 220 },
221 {name:"dt2821-f", 221 {.name = "dt2821-f",
222 adbits: 12, 222 .adbits = 12,
223 adchan_se:16, 223 .adchan_se = 16,
224 adchan_di:8, 224 .adchan_di = 8,
225 ai_speed:6500, 225 .ai_speed = 6500,
226 ispgl: 0, 226 .ispgl = 0,
227 dachan: 2, 227 .dachan = 2,
228 dabits: 12, 228 .dabits = 12,
229 }, 229 },
230 {name:"dt2821-g", 230 {.name = "dt2821-g",
231 adbits: 12, 231 .adbits = 12,
232 adchan_se:16, 232 .adchan_se = 16,
233 adchan_di:8, 233 .adchan_di = 8,
234 ai_speed:4000, 234 .ai_speed = 4000,
235 ispgl: 0, 235 .ispgl = 0,
236 dachan: 2, 236 .dachan = 2,
237 dabits: 12, 237 .dabits = 12,
238 }, 238 },
239 {name:"dt2823", 239 {.name = "dt2823",
240 adbits: 16, 240 .adbits = 16,
241 adchan_se:0, 241 .adchan_se = 0,
242 adchan_di:4, 242 .adchan_di = 4,
243 ai_speed:10000, 243 .ai_speed = 10000,
244 ispgl: 0, 244 .ispgl = 0,
245 dachan: 2, 245 .dachan = 2,
246 dabits: 16, 246 .dabits = 16,
247 }, 247 },
248 {name:"dt2824-pgh", 248 {.name = "dt2824-pgh",
249 adbits: 12, 249 .adbits = 12,
250 adchan_se:16, 250 .adchan_se = 16,
251 adchan_di:8, 251 .adchan_di = 8,
252 ai_speed:20000, 252 .ai_speed = 20000,
253 ispgl: 0, 253 .ispgl = 0,
254 dachan: 0, 254 .dachan = 0,
255 dabits: 0, 255 .dabits = 0,
256 }, 256 },
257 {name:"dt2824-pgl", 257 {.name = "dt2824-pgl",
258 adbits: 12, 258 .adbits = 12,
259 adchan_se:16, 259 .adchan_se = 16,
260 adchan_di:8, 260 .adchan_di = 8,
261 ai_speed:20000, 261 .ai_speed = 20000,
262 ispgl: 1, 262 .ispgl = 1,
263 dachan: 0, 263 .dachan = 0,
264 dabits: 0, 264 .dabits = 0,
265 }, 265 },
266 {name:"dt2825", 266 {.name = "dt2825",
267 adbits: 12, 267 .adbits = 12,
268 adchan_se:16, 268 .adchan_se = 16,
269 adchan_di:8, 269 .adchan_di = 8,
270 ai_speed:20000, 270 .ai_speed = 20000,
271 ispgl: 1, 271 .ispgl = 1,
272 dachan: 2, 272 .dachan = 2,
273 dabits: 12, 273 .dabits = 12,
274 }, 274 },
275 {name:"dt2827", 275 {.name = "dt2827",
276 adbits: 16, 276 .adbits = 16,
277 adchan_se:0, 277 .adchan_se = 0,
278 adchan_di:4, 278 .adchan_di = 4,
279 ai_speed:10000, 279 .ai_speed = 10000,
280 ispgl: 0, 280 .ispgl = 0,
281 dachan: 2, 281 .dachan = 2,
282 dabits: 12, 282 .dabits = 12,
283 }, 283 },
284 {name:"dt2828", 284 {.name = "dt2828",
285 adbits: 12, 285 .adbits = 12,
286 adchan_se:4, 286 .adchan_se = 4,
287 adchan_di:0, 287 .adchan_di = 0,
288 ai_speed:10000, 288 .ai_speed = 10000,
289 ispgl: 0, 289 .ispgl = 0,
290 dachan: 2, 290 .dachan = 2,
291 dabits: 12, 291 .dabits = 12,
292 }, 292 },
293 {name:"dt2829", 293 {.name = "dt2829",
294 adbits: 16, 294 .adbits = 16,
295 adchan_se:8, 295 .adchan_se = 8,
296 adchan_di:0, 296 .adchan_di = 0,
297 ai_speed:33250, 297 .ai_speed = 33250,
298 ispgl: 0, 298 .ispgl = 0,
299 dachan: 2, 299 .dachan = 2,
300 dabits: 16, 300 .dabits = 16,
301 }, 301 },
302 {name:"dt21-ez", 302 {.name = "dt21-ez",
303 adbits: 12, 303 .adbits = 12,
304 adchan_se:16, 304 .adchan_se = 16,
305 adchan_di:8, 305 .adchan_di = 8,
306 ai_speed:10000, 306 .ai_speed = 10000,
307 ispgl: 0, 307 .ispgl = 0,
308 dachan: 2, 308 .dachan = 2,
309 dabits: 12, 309 .dabits = 12,
310 }, 310 },
311 {name:"dt23-ez", 311 {.name = "dt23-ez",
312 adbits: 16, 312 .adbits = 16,
313 adchan_se:16, 313 .adchan_se = 16,
314 adchan_di:8, 314 .adchan_di = 8,
315 ai_speed:10000, 315 .ai_speed = 10000,
316 ispgl: 0, 316 .ispgl = 0,
317 dachan: 0, 317 .dachan = 0,
318 dabits: 0, 318 .dabits = 0,
319 }, 319 },
320 {name:"dt24-ez", 320 {.name = "dt24-ez",
321 adbits: 12, 321 .adbits = 12,
322 adchan_se:16, 322 .adchan_se = 16,
323 adchan_di:8, 323 .adchan_di = 8,
324 ai_speed:10000, 324 .ai_speed = 10000,
325 ispgl: 0, 325 .ispgl = 0,
326 dachan: 0, 326 .dachan = 0,
327 dabits: 0, 327 .dabits = 0,
328 }, 328 },
329 {name:"dt24-ez-pgl", 329 {.name = "dt24-ez-pgl",
330 adbits: 12, 330 .adbits = 12,
331 adchan_se:16, 331 .adchan_se = 16,
332 adchan_di:8, 332 .adchan_di = 8,
333 ai_speed:10000, 333 .ai_speed = 10000,
334 ispgl: 1, 334 .ispgl = 1,
335 dachan: 0, 335 .dachan = 0,
336 dabits: 0, 336 .dabits = 0,
337 }, 337 },
338}; 338};
339 339
340#define n_boardtypes sizeof(boardtypes)/sizeof(struct dt282x_board) 340#define n_boardtypes sizeof(boardtypes)/sizeof(struct dt282x_board)
@@ -397,13 +397,13 @@ struct dt282x_private {
397static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it); 397static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it);
398static int dt282x_detach(struct comedi_device *dev); 398static int dt282x_detach(struct comedi_device *dev);
399static struct comedi_driver driver_dt282x = { 399static struct comedi_driver driver_dt282x = {
400 driver_name:"dt282x", 400 .driver_name = "dt282x",
401 module:THIS_MODULE, 401 .module = THIS_MODULE,
402 attach:dt282x_attach, 402 .attach = dt282x_attach,
403 detach:dt282x_detach, 403 .detach = dt282x_detach,
404 board_name:&boardtypes[0].name, 404 .board_name = &boardtypes[0].name,
405 num_names:n_boardtypes, 405 .num_names = n_boardtypes,
406 offset:sizeof(struct dt282x_board), 406 .offset = sizeof(struct dt282x_board),
407}; 407};
408 408
409COMEDI_INITCLEANUP(driver_dt282x); 409COMEDI_INITCLEANUP(driver_dt282x);
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index c894e384c8a..7440921c408 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -95,69 +95,69 @@ struct dt3k_boardtype {
95 95
96 96
97static const struct dt3k_boardtype dt3k_boardtypes[] = { 97static const struct dt3k_boardtype dt3k_boardtypes[] = {
98 {name:"dt3001", 98 {.name = "dt3001",
99 device_id:0x22, 99 .device_id = 0x22,
100 adchan: 16, 100 .adchan = 16,
101 adbits: 12, 101 .adbits = 12,
102 adrange: &range_dt3000_ai, 102 .adrange = &range_dt3000_ai,
103 ai_speed:3000, 103 .ai_speed = 3000,
104 dachan: 2, 104 .dachan = 2,
105 dabits: 12, 105 .dabits = 12,
106 }, 106 },
107 {name:"dt3001-pgl", 107 {.name = "dt3001-pgl",
108 device_id:0x27, 108 .device_id = 0x27,
109 adchan: 16, 109 .adchan = 16,
110 adbits: 12, 110 .adbits = 12,
111 adrange: &range_dt3000_ai_pgl, 111 .adrange = &range_dt3000_ai_pgl,
112 ai_speed:3000, 112 .ai_speed = 3000,
113 dachan: 2, 113 .dachan = 2,
114 dabits: 12, 114 .dabits = 12,
115 }, 115 },
116 {name:"dt3002", 116 {.name = "dt3002",
117 device_id:0x23, 117 .device_id = 0x23,
118 adchan: 32, 118 .adchan = 32,
119 adbits: 12, 119 .adbits = 12,
120 adrange: &range_dt3000_ai, 120 .adrange = &range_dt3000_ai,
121 ai_speed:3000, 121 .ai_speed = 3000,
122 dachan: 0, 122 .dachan = 0,
123 dabits: 0, 123 .dabits = 0,
124 }, 124 },
125 {name:"dt3003", 125 {.name = "dt3003",
126 device_id:0x24, 126 .device_id = 0x24,
127 adchan: 64, 127 .adchan = 64,
128 adbits: 12, 128 .adbits = 12,
129 adrange: &range_dt3000_ai, 129 .adrange = &range_dt3000_ai,
130 ai_speed:3000, 130 .ai_speed = 3000,
131 dachan: 2, 131 .dachan = 2,
132 dabits: 12, 132 .dabits = 12,
133 }, 133 },
134 {name:"dt3003-pgl", 134 {.name = "dt3003-pgl",
135 device_id:0x28, 135 .device_id = 0x28,
136 adchan: 64, 136 .adchan = 64,
137 adbits: 12, 137 .adbits = 12,
138 adrange: &range_dt3000_ai_pgl, 138 .adrange = &range_dt3000_ai_pgl,
139 ai_speed:3000, 139 .ai_speed = 3000,
140 dachan: 2, 140 .dachan = 2,
141 dabits: 12, 141 .dabits = 12,
142 }, 142 },
143 {name:"dt3004", 143 {.name = "dt3004",
144 device_id:0x25, 144 .device_id = 0x25,
145 adchan: 16, 145 .adchan = 16,
146 adbits: 16, 146 .adbits = 16,
147 adrange: &range_dt3000_ai, 147 .adrange = &range_dt3000_ai,
148 ai_speed:10000, 148 .ai_speed = 10000,
149 dachan: 2, 149 .dachan = 2,
150 dabits: 12, 150 .dabits = 12,
151 }, 151 },
152 {name:"dt3005", /* a.k.a. 3004-200 */ 152 {.name = "dt3005", /* a.k.a. 3004-200 */
153 device_id:0x26, 153 .device_id = 0x26,
154 adchan: 16, 154 .adchan = 16,
155 adbits: 16, 155 .adbits = 16,
156 adrange: &range_dt3000_ai, 156 .adrange = &range_dt3000_ai,
157 ai_speed:5000, 157 .ai_speed = 5000,
158 dachan: 2, 158 .dachan = 2,
159 dabits: 12, 159 .dabits = 12,
160 }, 160 },
161}; 161};
162 162
163#define n_dt3k_boards sizeof(dt3k_boardtypes)/sizeof(struct dt3k_boardtype) 163#define n_dt3k_boards sizeof(dt3k_boardtypes)/sizeof(struct dt3k_boardtype)
@@ -278,10 +278,10 @@ struct dt3k_private {
278static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it); 278static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it);
279static int dt3000_detach(struct comedi_device *dev); 279static int dt3000_detach(struct comedi_device *dev);
280static struct comedi_driver driver_dt3000 = { 280static struct comedi_driver driver_dt3000 = {
281 driver_name:"dt3000", 281 .driver_name = "dt3000",
282 module:THIS_MODULE, 282 .module = THIS_MODULE,
283 attach:dt3000_attach, 283 .attach = dt3000_attach,
284 detach:dt3000_detach, 284 .detach = dt3000_detach,
285}; 285};
286 286
287COMEDI_PCI_INITCLEANUP(driver_dt3000, dt3k_pci_table); 287COMEDI_PCI_INITCLEANUP(driver_dt3000, dt3k_pci_table);
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index 5a9a254997a..f8ee5c5493b 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -46,10 +46,10 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it);
46static int fl512_detach(struct comedi_device *dev); 46static int fl512_detach(struct comedi_device *dev);
47 47
48static struct comedi_driver driver_fl512 = { 48static struct comedi_driver driver_fl512 = {
49 driver_name:"fl512", 49 .driver_name = "fl512",
50 module:THIS_MODULE, 50 .module = THIS_MODULE,
51 attach:fl512_attach, 51 .attach = fl512_attach,
52 detach:fl512_detach, 52 .detach = fl512_detach,
53}; 53};
54 54
55COMEDI_INITCLEANUP(driver_fl512); 55COMEDI_INITCLEANUP(driver_fl512);
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index d25b4c8aeae..567dd5290e8 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -270,15 +270,15 @@ struct hpdi_board {
270 270
271static const struct hpdi_board hpdi_boards[] = { 271static const struct hpdi_board hpdi_boards[] = {
272 { 272 {
273 name: "pci-hpdi32", 273 .name = "pci-hpdi32",
274 device_id:PCI_DEVICE_ID_PLX_9080, 274 .device_id = PCI_DEVICE_ID_PLX_9080,
275 subdevice_id:0x2400, 275 .subdevice_id = 0x2400,
276 }, 276 },
277#if 0 277#if 0
278 { 278 {
279 name: "pxi-hpdi32", 279 .name = "pxi-hpdi32",
280 device_id:0x9656, 280 .device_id = 0x9656,
281 subdevice_id:0x2705, 281 .subdevice_id = 0x2705,
282 }, 282 },
283#endif 283#endif
284}; 284};
@@ -332,10 +332,10 @@ static inline struct hpdi_private *priv(struct comedi_device * dev)
332} 332}
333 333
334static struct comedi_driver driver_hpdi = { 334static struct comedi_driver driver_hpdi = {
335 driver_name:"gsc_hpdi", 335 .driver_name = "gsc_hpdi",
336 module:THIS_MODULE, 336 .module = THIS_MODULE,
337 attach:hpdi_attach, 337 .attach = hpdi_attach,
338 detach:hpdi_detach, 338 .detach = hpdi_detach,
339}; 339};
340 340
341COMEDI_PCI_INITCLEANUP(driver_hpdi, hpdi_pci_table); 341COMEDI_PCI_INITCLEANUP(driver_hpdi, hpdi_pci_table);
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c
index f4790bfa08e..a90d65fde31 100644
--- a/drivers/staging/comedi/drivers/ii_pci20kc.c
+++ b/drivers/staging/comedi/drivers/ii_pci20kc.c
@@ -162,10 +162,10 @@ static int pci20xxx_attach(struct comedi_device *dev, struct comedi_devconfig *i
162static int pci20xxx_detach(struct comedi_device *dev); 162static int pci20xxx_detach(struct comedi_device *dev);
163 163
164static struct comedi_driver driver_pci20xxx = { 164static struct comedi_driver driver_pci20xxx = {
165 driver_name:"ii_pci20kc", 165 .driver_name = "ii_pci20kc",
166 module:THIS_MODULE, 166 .module = THIS_MODULE,
167 attach:pci20xxx_attach, 167 .attach = pci20xxx_attach,
168 detach:pci20xxx_detach, 168 .detach = pci20xxx_detach,
169}; 169};
170 170
171static int pci20006_init(struct comedi_device *dev, struct comedi_subdevice *s, 171static int pci20006_init(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 3cb5e4753df..d1f3bae1552 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -58,10 +58,10 @@ static int jr3_pci_attach(struct comedi_device *dev, struct comedi_devconfig *it
58static int jr3_pci_detach(struct comedi_device *dev); 58static int jr3_pci_detach(struct comedi_device *dev);
59 59
60static struct comedi_driver driver_jr3_pci = { 60static struct comedi_driver driver_jr3_pci = {
61 driver_name:"jr3_pci", 61 .driver_name = "jr3_pci",
62 module:THIS_MODULE, 62 .module = THIS_MODULE,
63 attach:jr3_pci_attach, 63 .attach = jr3_pci_attach,
64 detach:jr3_pci_detach, 64 .detach = jr3_pci_detach,
65}; 65};
66 66
67static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { 67static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index e1f84a5c967..b49aed5c4a0 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -72,10 +72,10 @@ struct cnt_board_struct {
72 72
73static const struct cnt_board_struct cnt_boards[] = { 73static const struct cnt_board_struct cnt_boards[] = {
74 { 74 {
75 name: CNT_DRIVER_NAME, 75 .name = CNT_DRIVER_NAME,
76 device_id:CNT_CARD_DEVICE_ID, 76 .device_id = CNT_CARD_DEVICE_ID,
77 cnt_channel_nbr:3, 77 .cnt_channel_nbr = 3,
78 cnt_bits:24} 78 .cnt_bits = 24}
79}; 79};
80 80
81#define cnt_board_nbr (sizeof(cnt_boards)/sizeof(struct cnt_board_struct)) 81#define cnt_board_nbr (sizeof(cnt_boards)/sizeof(struct cnt_board_struct))
@@ -91,10 +91,10 @@ struct cnt_device_private {
91#define devpriv ((struct cnt_device_private *)dev->private) 91#define devpriv ((struct cnt_device_private *)dev->private)
92 92
93static struct comedi_driver cnt_driver = { 93static struct comedi_driver cnt_driver = {
94 driver_name:CNT_DRIVER_NAME, 94 .driver_name = CNT_DRIVER_NAME,
95 module:THIS_MODULE, 95 .module = THIS_MODULE,
96 attach:cnt_attach, 96 .attach = cnt_attach,
97 detach:cnt_detach, 97 .detach = cnt_detach,
98}; 98};
99 99
100COMEDI_PCI_INITCLEANUP(cnt_driver, cnt_pci_table); 100COMEDI_PCI_INITCLEANUP(cnt_driver, cnt_pci_table);
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index a00ad1b63ed..15731a28544 100644
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -150,10 +150,10 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
150static int mpc624_detach(struct comedi_device *dev); 150static int mpc624_detach(struct comedi_device *dev);
151/* ---------------------------------------------------------------------------- */ 151/* ---------------------------------------------------------------------------- */
152static struct comedi_driver driver_mpc624 = { 152static struct comedi_driver driver_mpc624 = {
153 driver_name:"mpc624", 153 .driver_name = "mpc624",
154 module:THIS_MODULE, 154 .module = THIS_MODULE,
155 attach:mpc624_attach, 155 .attach = mpc624_attach,
156 detach:mpc624_detach 156 .detach = mpc624_detach
157}; 157};
158 158
159/* ---------------------------------------------------------------------------- */ 159/* ---------------------------------------------------------------------------- */
diff --git a/drivers/staging/comedi/drivers/mpc8260cpm.c b/drivers/staging/comedi/drivers/mpc8260cpm.c
index 147108f7202..c7ee3ef1013 100644
--- a/drivers/staging/comedi/drivers/mpc8260cpm.c
+++ b/drivers/staging/comedi/drivers/mpc8260cpm.c
@@ -49,10 +49,10 @@ struct mpc8260cpm_private {
49static int mpc8260cpm_attach(struct comedi_device *dev, struct comedi_devconfig *it); 49static int mpc8260cpm_attach(struct comedi_device *dev, struct comedi_devconfig *it);
50static int mpc8260cpm_detach(struct comedi_device *dev); 50static int mpc8260cpm_detach(struct comedi_device *dev);
51static struct comedi_driver driver_mpc8260cpm = { 51static struct comedi_driver driver_mpc8260cpm = {
52 driver_name:"mpc8260cpm", 52 .driver_name = "mpc8260cpm",
53 module:THIS_MODULE, 53 .module = THIS_MODULE,
54 attach:mpc8260cpm_attach, 54 .attach = mpc8260cpm_attach,
55 detach:mpc8260cpm_detach, 55 .detach = mpc8260cpm_detach,
56}; 56};
57 57
58COMEDI_INITCLEANUP(driver_mpc8260cpm); 58COMEDI_INITCLEANUP(driver_mpc8260cpm);
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index 5b155be0cf9..b3412241633 100644
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -85,10 +85,10 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3)
85static int multiq3_attach(struct comedi_device *dev, struct comedi_devconfig *it); 85static int multiq3_attach(struct comedi_device *dev, struct comedi_devconfig *it);
86static int multiq3_detach(struct comedi_device *dev); 86static int multiq3_detach(struct comedi_device *dev);
87static struct comedi_driver driver_multiq3 = { 87static struct comedi_driver driver_multiq3 = {
88 driver_name:"multiq3", 88 .driver_name = "multiq3",
89 module:THIS_MODULE, 89 .module = THIS_MODULE,
90 attach:multiq3_attach, 90 .attach = multiq3_attach,
91 detach:multiq3_detach, 91 .detach = multiq3_detach,
92}; 92};
93 93
94COMEDI_INITCLEANUP(driver_multiq3); 94COMEDI_INITCLEANUP(driver_multiq3);
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 78ba17aec0a..2751ea7f919 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -78,10 +78,10 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800
78static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it); 78static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it);
79static int ni6527_detach(struct comedi_device *dev); 79static int ni6527_detach(struct comedi_device *dev);
80static struct comedi_driver driver_ni6527 = { 80static struct comedi_driver driver_ni6527 = {
81 driver_name:"ni6527", 81 .driver_name = "ni6527",
82 module:THIS_MODULE, 82 .module = THIS_MODULE,
83 attach:ni6527_attach, 83 .attach = ni6527_attach,
84 detach:ni6527_detach, 84 .detach = ni6527_detach,
85}; 85};
86 86
87struct ni6527_board { 87struct ni6527_board {
@@ -92,12 +92,12 @@ struct ni6527_board {
92 92
93static const struct ni6527_board ni6527_boards[] = { 93static const struct ni6527_board ni6527_boards[] = {
94 { 94 {
95 dev_id: 0x2b20, 95 .dev_id = 0x2b20,
96 name: "pci-6527", 96 .name = "pci-6527",
97 }, 97 },
98 { 98 {
99 dev_id: 0x2b10, 99 .dev_id = 0x2b10,
100 name: "pxi-6527", 100 .name = "pxi-6527",
101 }, 101 },
102}; 102};
103 103
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 7cf22c0f566..b4e63fba8ab 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -105,10 +105,10 @@ static inline unsigned Filter_Enable(unsigned port)
105static int ni_65xx_attach(struct comedi_device *dev, struct comedi_devconfig *it); 105static int ni_65xx_attach(struct comedi_device *dev, struct comedi_devconfig *it);
106static int ni_65xx_detach(struct comedi_device *dev); 106static int ni_65xx_detach(struct comedi_device *dev);
107static struct comedi_driver driver_ni_65xx = { 107static struct comedi_driver driver_ni_65xx = {
108 driver_name:"ni_65xx", 108 .driver_name = "ni_65xx",
109 module:THIS_MODULE, 109 .module = THIS_MODULE,
110 attach:ni_65xx_attach, 110 .attach = ni_65xx_attach,
111 detach:ni_65xx_detach, 111 .detach = ni_65xx_detach,
112}; 112};
113 113
114struct ni_65xx_board { 114struct ni_65xx_board {
@@ -123,120 +123,120 @@ struct ni_65xx_board {
123 123
124static const struct ni_65xx_board ni_65xx_boards[] = { 124static const struct ni_65xx_board ni_65xx_boards[] = {
125 { 125 {
126 dev_id: 0x7085, 126 .dev_id = 0x7085,
127 name: "pci-6509", 127 .name = "pci-6509",
128 num_dio_ports:12, 128 .num_dio_ports = 12,
129 invert_outputs:0}, 129 .invert_outputs = 0},
130 { 130 {
131 dev_id: 0x1710, 131 .dev_id = 0x1710,
132 name: "pxi-6509", 132 .name = "pxi-6509",
133 num_dio_ports:12, 133 .num_dio_ports = 12,
134 invert_outputs:0}, 134 .invert_outputs = 0},
135 { 135 {
136 dev_id: 0x7124, 136 .dev_id = 0x7124,
137 name: "pci-6510", 137 .name = "pci-6510",
138 num_di_ports:4}, 138 .num_di_ports = 4},
139 { 139 {
140 dev_id: 0x70c3, 140 .dev_id = 0x70c3,
141 name: "pci-6511", 141 .name = "pci-6511",
142 num_di_ports:8}, 142 .num_di_ports = 8},
143 { 143 {
144 dev_id: 0x70d3, 144 .dev_id = 0x70d3,
145 name: "pxi-6511", 145 .name = "pxi-6511",
146 num_di_ports:8}, 146 .num_di_ports = 8},
147 { 147 {
148 dev_id: 0x70cc, 148 .dev_id = 0x70cc,
149 name: "pci-6512", 149 .name = "pci-6512",
150 num_do_ports:8}, 150 .num_do_ports = 8},
151 { 151 {
152 dev_id: 0x70d2, 152 .dev_id = 0x70d2,
153 name: "pxi-6512", 153 .name = "pxi-6512",
154 num_do_ports:8}, 154 .num_do_ports = 8},
155 { 155 {
156 dev_id: 0x70c8, 156 .dev_id = 0x70c8,
157 name: "pci-6513", 157 .name = "pci-6513",
158 num_do_ports:8, 158 .num_do_ports = 8,
159 invert_outputs:1}, 159 .invert_outputs = 1},
160 { 160 {
161 dev_id: 0x70d1, 161 .dev_id = 0x70d1,
162 name: "pxi-6513", 162 .name = "pxi-6513",
163 num_do_ports:8, 163 .num_do_ports = 8,
164 invert_outputs:1}, 164 .invert_outputs = 1},
165 { 165 {
166 dev_id: 0x7088, 166 .dev_id = 0x7088,
167 name: "pci-6514", 167 .name = "pci-6514",
168 num_di_ports:4, 168 .num_di_ports = 4,
169 num_do_ports:4, 169 .num_do_ports = 4,
170 invert_outputs:1}, 170 .invert_outputs = 1},
171 { 171 {
172 dev_id: 0x70CD, 172 .dev_id = 0x70CD,
173 name: "pxi-6514", 173 .name = "pxi-6514",
174 num_di_ports:4, 174 .num_di_ports = 4,
175 num_do_ports:4, 175 .num_do_ports = 4,
176 invert_outputs:1}, 176 .invert_outputs = 1},
177 { 177 {
178 dev_id: 0x7087, 178 .dev_id = 0x7087,
179 name: "pci-6515", 179 .name = "pci-6515",
180 num_di_ports:4, 180 .num_di_ports = 4,
181 num_do_ports:4, 181 .num_do_ports = 4,
182 invert_outputs:1}, 182 .invert_outputs = 1},
183 { 183 {
184 dev_id: 0x70c9, 184 .dev_id = 0x70c9,
185 name: "pxi-6515", 185 .name = "pxi-6515",
186 num_di_ports:4, 186 .num_di_ports = 4,
187 num_do_ports:4, 187 .num_do_ports = 4,
188 invert_outputs:1}, 188 .invert_outputs = 1},
189 { 189 {
190 dev_id: 0x7125, 190 .dev_id = 0x7125,
191 name: "pci-6516", 191 .name = "pci-6516",
192 num_do_ports:4, 192 .num_do_ports = 4,
193 invert_outputs:1}, 193 .invert_outputs = 1},
194 { 194 {
195 dev_id: 0x7126, 195 .dev_id = 0x7126,
196 name: "pci-6517", 196 .name = "pci-6517",
197 num_do_ports:4, 197 .num_do_ports = 4,
198 invert_outputs:1}, 198 .invert_outputs = 1},
199 { 199 {
200 dev_id: 0x7127, 200 .dev_id = 0x7127,
201 name: "pci-6518", 201 .name = "pci-6518",
202 num_di_ports:2, 202 .num_di_ports = 2,
203 num_do_ports:2, 203 .num_do_ports = 2,
204 invert_outputs:1}, 204 .invert_outputs = 1},
205 { 205 {
206 dev_id: 0x7128, 206 .dev_id = 0x7128,
207 name: "pci-6519", 207 .name = "pci-6519",
208 num_di_ports:2, 208 .num_di_ports = 2,
209 num_do_ports:2, 209 .num_do_ports = 2,
210 invert_outputs:1}, 210 .invert_outputs = 1},
211 { 211 {
212 dev_id: 0x71c5, 212 .dev_id = 0x71c5,
213 name: "pci-6520", 213 .name = "pci-6520",
214 num_di_ports:1, 214 .num_di_ports = 1,
215 num_do_ports:1, 215 .num_do_ports = 1,
216 }, 216 },
217 { 217 {
218 dev_id: 0x718b, 218 .dev_id = 0x718b,
219 name: "pci-6521", 219 .name = "pci-6521",
220 num_di_ports:1, 220 .num_di_ports = 1,
221 num_do_ports:1, 221 .num_do_ports = 1,
222 }, 222 },
223 { 223 {
224 dev_id: 0x718c, 224 .dev_id = 0x718c,
225 name: "pxi-6521", 225 .name = "pxi-6521",
226 num_di_ports:1, 226 .num_di_ports = 1,
227 num_do_ports:1, 227 .num_do_ports = 1,
228 }, 228 },
229 { 229 {
230 dev_id: 0x70a9, 230 .dev_id = 0x70a9,
231 name: "pci-6528", 231 .name = "pci-6528",
232 num_di_ports:3, 232 .num_di_ports = 3,
233 num_do_ports:3, 233 .num_do_ports = 3,
234 }, 234 },
235 { 235 {
236 dev_id: 0x7086, 236 .dev_id = 0x7086,
237 name: "pxi-6528", 237 .name = "pxi-6528",
238 num_di_ports:3, 238 .num_di_ports = 3,
239 num_do_ports:3, 239 .num_do_ports = 3,
240 }, 240 },
241}; 241};
242 242
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 3c35dab0279..78c106ce5fa 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -387,24 +387,24 @@ struct ni_660x_board {
387 387
388static const struct ni_660x_board ni_660x_boards[] = { 388static const struct ni_660x_board ni_660x_boards[] = {
389 { 389 {
390 dev_id: 0x2c60, 390 .dev_id = 0x2c60,
391 name: "PCI-6601", 391 .name = "PCI-6601",
392 n_chips: 1, 392 .n_chips = 1,
393 }, 393 },
394 { 394 {
395 dev_id: 0x1310, 395 .dev_id = 0x1310,
396 name: "PCI-6602", 396 .name = "PCI-6602",
397 n_chips: 2, 397 .n_chips = 2,
398 }, 398 },
399 { 399 {
400 dev_id: 0x1360, 400 .dev_id = 0x1360,
401 name: "PXI-6602", 401 .name = "PXI-6602",
402 n_chips: 2, 402 .n_chips = 2,
403 }, 403 },
404 { 404 {
405 dev_id: 0x2cc0, 405 .dev_id = 0x2cc0,
406 name: "PXI-6608", 406 .name = "PXI-6608",
407 n_chips: 2, 407 .n_chips = 2,
408 }, 408 },
409}; 409};
410 410
@@ -455,10 +455,10 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev, unsigned pfi_ch
455 unsigned output_select); 455 unsigned output_select);
456 456
457static struct comedi_driver driver_ni_660x = { 457static struct comedi_driver driver_ni_660x = {
458 driver_name:"ni_660x", 458 .driver_name = "ni_660x",
459 module:THIS_MODULE, 459 .module = THIS_MODULE,
460 attach:ni_660x_attach, 460 .attach = ni_660x_attach,
461 detach:ni_660x_detach, 461 .detach = ni_660x_detach,
462}; 462};
463 463
464COMEDI_PCI_INITCLEANUP(driver_ni_660x, ni_660x_pci_table); 464COMEDI_PCI_INITCLEANUP(driver_ni_660x, ni_660x_pci_table);
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 0caa4864190..0a9678cdadc 100644
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -69,22 +69,22 @@ struct ni_670x_board {
69 69
70static const struct ni_670x_board ni_670x_boards[] = { 70static const struct ni_670x_board ni_670x_boards[] = {
71 { 71 {
72 dev_id: 0x2c90, 72 .dev_id = 0x2c90,
73 name: "PCI-6703", 73 .name = "PCI-6703",
74 ao_chans:16, 74 .ao_chans = 16,
75 ao_bits: 16, 75 .ao_bits = 16,
76 }, 76 },
77 { 77 {
78 dev_id: 0x1920, 78 .dev_id = 0x1920,
79 name: "PXI-6704", 79 .name = "PXI-6704",
80 ao_chans:32, 80 .ao_chans = 32,
81 ao_bits: 16, 81 .ao_bits = 16,
82 }, 82 },
83 { 83 {
84 dev_id: 0x1290, 84 .dev_id = 0x1290,
85 name: "PCI-6704", 85 .name = "PCI-6704",
86 ao_chans:32, 86 .ao_chans = 32,
87 ao_bits: 16, 87 .ao_bits = 16,
88 }, 88 },
89}; 89};
90 90
@@ -115,10 +115,10 @@ static int ni_670x_attach(struct comedi_device *dev, struct comedi_devconfig *it
115static int ni_670x_detach(struct comedi_device *dev); 115static int ni_670x_detach(struct comedi_device *dev);
116 116
117static struct comedi_driver driver_ni_670x = { 117static struct comedi_driver driver_ni_670x = {
118 driver_name:"ni_670x", 118 .driver_name = "ni_670x",
119 module:THIS_MODULE, 119 .module = THIS_MODULE,
120 attach:ni_670x_attach, 120 .attach = ni_670x_attach,
121 detach:ni_670x_detach, 121 .detach = ni_670x_detach,
122}; 122};
123 123
124COMEDI_PCI_INITCLEANUP(driver_ni_670x, ni_670x_pci_table); 124COMEDI_PCI_INITCLEANUP(driver_ni_670x, ni_670x_pci_table);
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 62754d5372a..0e42f18cdbf 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -138,16 +138,16 @@ static const struct comedi_lrange range_a2150 = {
138enum { a2150_c, a2150_s }; 138enum { a2150_c, a2150_s };
139static const struct a2150_board a2150_boards[] = { 139static const struct a2150_board a2150_boards[] = {
140 { 140 {
141 name: "at-a2150c", 141 .name = "at-a2150c",
142 clock: {31250, 22676, 20833, 19531}, 142 .clock = {31250, 22676, 20833, 19531},
143 num_clocks:4, 143 .num_clocks = 4,
144 ai_speed:19531, 144 .ai_speed = 19531,
145 }, 145 },
146 { 146 {
147 name: "at-a2150s", 147 .name = "at-a2150s",
148 clock: {62500, 50000, 41667, 0}, 148 .clock = {62500, 50000, 41667, 0},
149 num_clocks:3, 149 .num_clocks = 3,
150 ai_speed:41667, 150 .ai_speed = 41667,
151 }, 151 },
152}; 152};
153 153
@@ -174,10 +174,10 @@ static int a2150_detach(struct comedi_device *dev);
174static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s); 174static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
175 175
176static struct comedi_driver driver_a2150 = { 176static struct comedi_driver driver_a2150 = {
177 driver_name:"ni_at_a2150", 177 .driver_name = "ni_at_a2150",
178 module:THIS_MODULE, 178 .module = THIS_MODULE,
179 attach:a2150_attach, 179 .attach = a2150_attach,
180 detach:a2150_detach, 180 .detach = a2150_detach,
181}; 181};
182 182
183static irqreturn_t a2150_interrupt(int irq, void *d); 183static irqreturn_t a2150_interrupt(int irq, void *d);
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 282457ccefb..1b752f61500 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -158,12 +158,12 @@ struct atao_board {
158 158
159static const struct atao_board atao_boards[] = { 159static const struct atao_board atao_boards[] = {
160 { 160 {
161 name: "ai-ao-6", 161 .name = "ai-ao-6",
162 n_ao_chans:6, 162 .n_ao_chans = 6,
163 }, 163 },
164 { 164 {
165 name: "ai-ao-10", 165 .name = "ai-ao-10",
166 n_ao_chans:10, 166 .n_ao_chans = 10,
167 }, 167 },
168}; 168};
169 169
@@ -184,13 +184,13 @@ struct atao_private {
184static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it); 184static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it);
185static int atao_detach(struct comedi_device *dev); 185static int atao_detach(struct comedi_device *dev);
186static struct comedi_driver driver_atao = { 186static struct comedi_driver driver_atao = {
187 driver_name:"ni_at_ao", 187 .driver_name = "ni_at_ao",
188 module:THIS_MODULE, 188 .module = THIS_MODULE,
189 attach:atao_attach, 189 .attach = atao_attach,
190 detach:atao_detach, 190 .detach = atao_detach,
191 board_name:&atao_boards[0].name, 191 .board_name = &atao_boards[0].name,
192 offset:sizeof(struct atao_board), 192 .offset = sizeof(struct atao_board),
193 num_names:sizeof(atao_boards) / sizeof(struct atao_board), 193 .num_names = sizeof(atao_boards) / sizeof(struct atao_board),
194}; 194};
195 195
196COMEDI_INITCLEANUP(driver_atao); 196COMEDI_INITCLEANUP(driver_atao);
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index c4c47497373..0116a4a0a06 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -115,155 +115,155 @@ are not supported.
115#define MAX_N_CALDACS 32 115#define MAX_N_CALDACS 32
116 116
117static const struct ni_board_struct ni_boards[] = { 117static const struct ni_board_struct ni_boards[] = {
118 {device_id:44, 118 {.device_id = 44,
119 isapnp_id:0x0000,/* XXX unknown */ 119 .isapnp_id = 0x0000,/* XXX unknown */
120 name: "at-mio-16e-1", 120 .name = "at-mio-16e-1",
121 n_adchan:16, 121 .n_adchan = 16,
122 adbits: 12, 122 .adbits = 12,
123 ai_fifo_depth:8192, 123 .ai_fifo_depth = 8192,
124 alwaysdither:0, 124 .alwaysdither = 0,
125 gainlkup:ai_gain_16, 125 .gainlkup = ai_gain_16,
126 ai_speed:800, 126 .ai_speed = 800,
127 n_aochan:2, 127 .n_aochan = 2,
128 aobits: 12, 128 .aobits = 12,
129 ao_fifo_depth:2048, 129 .ao_fifo_depth = 2048,
130 .ao_range_table = &range_ni_E_ao_ext, 130 .ao_range_table = &range_ni_E_ao_ext,
131 ao_unipolar:1, 131 .ao_unipolar = 1,
132 ao_speed:1000, 132 .ao_speed = 1000,
133 has_8255:0, 133 .has_8255 = 0,
134 .num_p0_dio_channels = 8, 134 .num_p0_dio_channels = 8,
135 caldac: {mb88341}, 135 .caldac = {mb88341},
136 }, 136 },
137 {device_id:25, 137 {.device_id = 25,
138 isapnp_id:0x1900, 138 .isapnp_id = 0x1900,
139 name: "at-mio-16e-2", 139 .name = "at-mio-16e-2",
140 n_adchan:16, 140 .n_adchan = 16,
141 adbits: 12, 141 .adbits = 12,
142 ai_fifo_depth:2048, 142 .ai_fifo_depth = 2048,
143 alwaysdither:0, 143 .alwaysdither = 0,
144 gainlkup:ai_gain_16, 144 .gainlkup = ai_gain_16,
145 ai_speed:2000, 145 .ai_speed = 2000,
146 n_aochan:2, 146 .n_aochan = 2,
147 aobits: 12, 147 .aobits = 12,
148 ao_fifo_depth:2048, 148 .ao_fifo_depth = 2048,
149 .ao_range_table = &range_ni_E_ao_ext, 149 .ao_range_table = &range_ni_E_ao_ext,
150 ao_unipolar:1, 150 .ao_unipolar = 1,
151 ao_speed:1000, 151 .ao_speed = 1000,
152 has_8255:0, 152 .has_8255 = 0,
153 .num_p0_dio_channels = 8, 153 .num_p0_dio_channels = 8,
154 caldac: {mb88341}, 154 .caldac = {mb88341},
155 }, 155 },
156 {device_id:36, 156 {.device_id = 36,
157 isapnp_id:0x2400, 157 .isapnp_id = 0x2400,
158 name: "at-mio-16e-10", 158 .name = "at-mio-16e-10",
159 n_adchan:16, 159 .n_adchan = 16,
160 adbits: 12, 160 .adbits = 12,
161 ai_fifo_depth:512, 161 .ai_fifo_depth = 512,
162 alwaysdither:0, 162 .alwaysdither = 0,
163 gainlkup:ai_gain_16, 163 .gainlkup = ai_gain_16,
164 ai_speed:10000, 164 .ai_speed = 10000,
165 n_aochan:2, 165 .n_aochan = 2,
166 aobits: 12, 166 .aobits = 12,
167 ao_fifo_depth:0, 167 .ao_fifo_depth = 0,
168 .ao_range_table = &range_ni_E_ao_ext, 168 .ao_range_table = &range_ni_E_ao_ext,
169 ao_unipolar:1, 169 .ao_unipolar = 1,
170 ao_speed:10000, 170 .ao_speed = 10000,
171 .num_p0_dio_channels = 8, 171 .num_p0_dio_channels = 8,
172 caldac: {ad8804_debug}, 172 .caldac = {ad8804_debug},
173 has_8255:0, 173 .has_8255 = 0,
174 }, 174 },
175 {device_id:37, 175 {.device_id = 37,
176 isapnp_id:0x2500, 176 .isapnp_id = 0x2500,
177 name: "at-mio-16de-10", 177 .name = "at-mio-16de-10",
178 n_adchan:16, 178 .n_adchan = 16,
179 adbits: 12, 179 .adbits = 12,
180 ai_fifo_depth:512, 180 .ai_fifo_depth = 512,
181 alwaysdither:0, 181 .alwaysdither = 0,
182 gainlkup:ai_gain_16, 182 .gainlkup = ai_gain_16,
183 ai_speed:10000, 183 .ai_speed = 10000,
184 n_aochan:2, 184 .n_aochan = 2,
185 aobits: 12, 185 .aobits = 12,
186 ao_fifo_depth:0, 186 .ao_fifo_depth = 0,
187 .ao_range_table = &range_ni_E_ao_ext, 187 .ao_range_table = &range_ni_E_ao_ext,
188 ao_unipolar:1, 188 .ao_unipolar = 1,
189 ao_speed:10000, 189 .ao_speed = 10000,
190 .num_p0_dio_channels = 8, 190 .num_p0_dio_channels = 8,
191 caldac: {ad8804_debug}, 191 .caldac = {ad8804_debug},
192 has_8255:1, 192 .has_8255 = 1,
193 }, 193 },
194 {device_id:38, 194 {.device_id = 38,
195 isapnp_id:0x2600, 195 .isapnp_id = 0x2600,
196 name: "at-mio-64e-3", 196 .name = "at-mio-64e-3",
197 n_adchan:64, 197 .n_adchan = 64,
198 adbits: 12, 198 .adbits = 12,
199 ai_fifo_depth:2048, 199 .ai_fifo_depth = 2048,
200 alwaysdither:0, 200 .alwaysdither = 0,
201 gainlkup:ai_gain_16, 201 .gainlkup = ai_gain_16,
202 ai_speed:2000, 202 .ai_speed = 2000,
203 n_aochan:2, 203 .n_aochan = 2,
204 aobits: 12, 204 .aobits = 12,
205 ao_fifo_depth:2048, 205 .ao_fifo_depth = 2048,
206 .ao_range_table = &range_ni_E_ao_ext, 206 .ao_range_table = &range_ni_E_ao_ext,
207 ao_unipolar:1, 207 .ao_unipolar = 1,
208 ao_speed:1000, 208 .ao_speed = 1000,
209 has_8255:0, 209 .has_8255 = 0,
210 .num_p0_dio_channels = 8, 210 .num_p0_dio_channels = 8,
211 caldac: {ad8804_debug}, 211 .caldac = {ad8804_debug},
212 }, 212 },
213 {device_id:39, 213 {.device_id = 39,
214 isapnp_id:0x2700, 214 .isapnp_id = 0x2700,
215 name: "at-mio-16xe-50", 215 .name = "at-mio-16xe-50",
216 n_adchan:16, 216 .n_adchan = 16,
217 adbits: 16, 217 .adbits = 16,
218 ai_fifo_depth:512, 218 .ai_fifo_depth = 512,
219 alwaysdither:1, 219 .alwaysdither = 1,
220 gainlkup:ai_gain_8, 220 .gainlkup = ai_gain_8,
221 ai_speed:50000, 221 .ai_speed = 50000,
222 n_aochan:2, 222 .n_aochan = 2,
223 aobits: 12, 223 .aobits = 12,
224 ao_fifo_depth:0, 224 .ao_fifo_depth = 0,
225 .ao_range_table = &range_bipolar10, 225 .ao_range_table = &range_bipolar10,
226 ao_unipolar:0, 226 .ao_unipolar = 0,
227 ao_speed:50000, 227 .ao_speed = 50000,
228 .num_p0_dio_channels = 8, 228 .num_p0_dio_channels = 8,
229 caldac: {dac8800, dac8043}, 229 .caldac = {dac8800, dac8043},
230 has_8255:0, 230 .has_8255 = 0,
231 }, 231 },
232 {device_id:50, 232 {.device_id = 50,
233 isapnp_id:0x0000,/* XXX unknown */ 233 .isapnp_id = 0x0000,/* XXX unknown */
234 name: "at-mio-16xe-10", 234 .name = "at-mio-16xe-10",
235 n_adchan:16, 235 .n_adchan = 16,
236 adbits: 16, 236 .adbits = 16,
237 ai_fifo_depth:512, 237 .ai_fifo_depth = 512,
238 alwaysdither:1, 238 .alwaysdither = 1,
239 gainlkup:ai_gain_14, 239 .gainlkup = ai_gain_14,
240 ai_speed:10000, 240 .ai_speed = 10000,
241 n_aochan:2, 241 .n_aochan = 2,
242 aobits: 16, 242 .aobits = 16,
243 ao_fifo_depth:2048, 243 .ao_fifo_depth = 2048,
244 .ao_range_table = &range_ni_E_ao_ext, 244 .ao_range_table = &range_ni_E_ao_ext,
245 ao_unipolar:1, 245 .ao_unipolar = 1,
246 ao_speed:1000, 246 .ao_speed = 1000,
247 .num_p0_dio_channels = 8, 247 .num_p0_dio_channels = 8,
248 caldac: {dac8800, dac8043, ad8522}, 248 .caldac = {dac8800, dac8043, ad8522},
249 has_8255:0, 249 .has_8255 = 0,
250 }, 250 },
251 {device_id:51, 251 {.device_id = 51,
252 isapnp_id:0x0000,/* XXX unknown */ 252 .isapnp_id = 0x0000,/* XXX unknown */
253 name: "at-ai-16xe-10", 253 .name = "at-ai-16xe-10",
254 n_adchan:16, 254 .n_adchan = 16,
255 adbits: 16, 255 .adbits = 16,
256 ai_fifo_depth:512, 256 .ai_fifo_depth = 512,
257 alwaysdither:1, /* unknown */ 257 .alwaysdither = 1, /* unknown */
258 gainlkup:ai_gain_14, 258 .gainlkup = ai_gain_14,
259 ai_speed:10000, 259 .ai_speed = 10000,
260 n_aochan:0, 260 .n_aochan = 0,
261 aobits: 0, 261 .aobits = 0,
262 ao_fifo_depth:0, 262 .ao_fifo_depth = 0,
263 ao_unipolar:0, 263 .ao_unipolar = 0,
264 .num_p0_dio_channels = 8, 264 .num_p0_dio_channels = 8,
265 caldac: {dac8800, dac8043, ad8522}, 265 .caldac = {dac8800, dac8043, ad8522},
266 has_8255:0, 266 .has_8255 = 0,
267 } 267 }
268}; 268};
269 269
@@ -342,10 +342,10 @@ MODULE_DEVICE_TABLE(pnp, device_ids);
342static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *it); 342static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *it);
343static int ni_atmio_detach(struct comedi_device *dev); 343static int ni_atmio_detach(struct comedi_device *dev);
344static struct comedi_driver driver_atmio = { 344static struct comedi_driver driver_atmio = {
345 driver_name:"ni_atmio", 345 .driver_name = "ni_atmio",
346 module:THIS_MODULE, 346 .module = THIS_MODULE,
347 attach:ni_atmio_attach, 347 .attach = ni_atmio_attach,
348 detach:ni_atmio_detach, 348 .detach = ni_atmio_detach,
349}; 349};
350 350
351COMEDI_INITCLEANUP(driver_atmio); 351COMEDI_INITCLEANUP(driver_atmio);
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index b110ec651b4..b02d2f33d52 100644
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -111,12 +111,12 @@ struct atmio16_board_t {
111 111
112static const struct atmio16_board_t atmio16_boards[] = { 112static const struct atmio16_board_t atmio16_boards[] = {
113 { 113 {
114 name: "atmio16", 114 .name = "atmio16",
115 has_8255:0, 115 .has_8255 = 0,
116 }, 116 },
117 { 117 {
118 name: "atmio16d", 118 .name = "atmio16d",
119 has_8255:1, 119 .has_8255 = 1,
120 }, 120 },
121}; 121};
122 122
@@ -137,13 +137,13 @@ static 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 = {
140 driver_name:"atmio16", 140 .driver_name = "atmio16",
141 module:THIS_MODULE, 141 .module = THIS_MODULE,
142 attach:atmio16d_attach, 142 .attach = atmio16d_attach,
143 detach:atmio16d_detach, 143 .detach = atmio16d_detach,
144 board_name:&atmio16_boards[0].name, 144 .board_name = &atmio16_boards[0].name,
145 num_names:n_atmio16_boards, 145 .num_names = n_atmio16_boards,
146 offset:sizeof(struct atmio16_board_t), 146 .offset = sizeof(struct atmio16_board_t),
147}; 147};
148 148
149COMEDI_INITCLEANUP(driver_atmio16d); 149COMEDI_INITCLEANUP(driver_atmio16d);
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 8f594a8778c..3f0c1b3694d 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -73,16 +73,16 @@ struct dio700_board {
73 73
74static const struct dio700_board dio700_boards[] = { 74static const struct dio700_board dio700_boards[] = {
75 { 75 {
76 name: "daqcard-700", 76 .name = "daqcard-700",
77 device_id:0x4743,/* 0x10b is manufacturer id, 0x4743 is device id */ 77 .device_id = 0x4743,/* 0x10b is manufacturer id, 0x4743 is device id */
78 bustype: pcmcia_bustype, 78 .bustype = pcmcia_bustype,
79 have_dio:1, 79 .have_dio = 1,
80 }, 80 },
81 { 81 {
82 name: "ni_daq_700", 82 .name = "ni_daq_700",
83 device_id:0x4743,/* 0x10b is manufacturer id, 0x4743 is device id */ 83 .device_id = 0x4743,/* 0x10b is manufacturer id, 0x4743 is device id */
84 bustype: pcmcia_bustype, 84 .bustype = pcmcia_bustype,
85 have_dio:1, 85 .have_dio = 1,
86 }, 86 },
87}; 87};
88 88
@@ -100,13 +100,13 @@ struct dio700_private {
100#define devpriv ((struct dio700_private *)dev->private) 100#define devpriv ((struct dio700_private *)dev->private)
101 101
102static struct comedi_driver driver_dio700 = { 102static struct comedi_driver driver_dio700 = {
103 driver_name:"ni_daq_700", 103 .driver_name = "ni_daq_700",
104 module:THIS_MODULE, 104 .module = THIS_MODULE,
105 attach:dio700_attach, 105 .attach = dio700_attach,
106 detach:dio700_detach, 106 .detach = dio700_detach,
107 num_names:sizeof(dio700_boards) / sizeof(struct dio700_board), 107 .num_names = sizeof(dio700_boards) / sizeof(struct dio700_board),
108 board_name:&dio700_boards[0].name, 108 .board_name = &dio700_boards[0].name,
109 offset:sizeof(struct dio700_board), 109 .offset = sizeof(struct dio700_board),
110}; 110};
111 111
112/* the real driver routines */ 112/* the real driver routines */
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index f7814dbedb4..a0b3dd25438 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -73,16 +73,16 @@ struct dio24_board_struct {
73 73
74static const struct dio24_board_struct dio24_boards[] = { 74static const struct dio24_board_struct dio24_boards[] = {
75 { 75 {
76 name: "daqcard-dio24", 76 .name = "daqcard-dio24",
77 device_id:0x475c,/* 0x10b is manufacturer id, 0x475c is device id */ 77 .device_id = 0x475c,/* 0x10b is manufacturer id, 0x475c is device id */
78 bustype: pcmcia_bustype, 78 .bustype = pcmcia_bustype,
79 have_dio:1, 79 .have_dio = 1,
80 }, 80 },
81 { 81 {
82 name: "ni_daq_dio24", 82 .name = "ni_daq_dio24",
83 device_id:0x475c,/* 0x10b is manufacturer id, 0x475c is device id */ 83 .device_id = 0x475c,/* 0x10b is manufacturer id, 0x475c is device id */
84 bustype: pcmcia_bustype, 84 .bustype = pcmcia_bustype,
85 have_dio:1, 85 .have_dio = 1,
86 }, 86 },
87}; 87};
88 88
@@ -100,13 +100,13 @@ struct dio24_private {
100#define devpriv ((struct dio24_private *)dev->private) 100#define devpriv ((struct dio24_private *)dev->private)
101 101
102static struct comedi_driver driver_dio24 = { 102static struct comedi_driver driver_dio24 = {
103 driver_name:"ni_daq_dio24", 103 .driver_name = "ni_daq_dio24",
104 module:THIS_MODULE, 104 .module = THIS_MODULE,
105 attach:dio24_attach, 105 .attach = dio24_attach,
106 detach:dio24_detach, 106 .detach = dio24_detach,
107 num_names:sizeof(dio24_boards) / sizeof(struct dio24_board_struct), 107 .num_names = sizeof(dio24_boards) / sizeof(struct dio24_board_struct),
108 board_name:&dio24_boards[0].name, 108 .board_name = &dio24_boards[0].name,
109 offset:sizeof(struct dio24_board_struct), 109 .offset = sizeof(struct dio24_board_struct),
110}; 110};
111 111
112static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) 112static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index caec783ca89..e6ee7d94ca9 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -362,54 +362,54 @@ static inline void labpc_writeb(unsigned int byte, unsigned long address)
362 362
363static const struct labpc_board_struct labpc_boards[] = { 363static const struct labpc_board_struct labpc_boards[] = {
364 { 364 {
365 name: "lab-pc-1200", 365 .name = "lab-pc-1200",
366 ai_speed:10000, 366 .ai_speed = 10000,
367 bustype: isa_bustype, 367 .bustype = isa_bustype,
368 register_layout:labpc_1200_layout, 368 .register_layout = labpc_1200_layout,
369 has_ao: 1, 369 .has_ao = 1,
370 ai_range_table:&range_labpc_1200_ai, 370 .ai_range_table = &range_labpc_1200_ai,
371 ai_range_code:labpc_1200_ai_gain_bits, 371 .ai_range_code = labpc_1200_ai_gain_bits,
372 ai_range_is_unipolar:labpc_1200_is_unipolar, 372 .ai_range_is_unipolar = labpc_1200_is_unipolar,
373 ai_scan_up:1, 373 .ai_scan_up = 1,
374 memory_mapped_io:0, 374 .memory_mapped_io = 0,
375 }, 375 },
376 { 376 {
377 name: "lab-pc-1200ai", 377 .name = "lab-pc-1200ai",
378 ai_speed:10000, 378 .ai_speed = 10000,
379 bustype: isa_bustype, 379 .bustype = isa_bustype,
380 register_layout:labpc_1200_layout, 380 .register_layout = labpc_1200_layout,
381 has_ao: 0, 381 .has_ao = 0,
382 ai_range_table:&range_labpc_1200_ai, 382 .ai_range_table = &range_labpc_1200_ai,
383 ai_range_code:labpc_1200_ai_gain_bits, 383 .ai_range_code = labpc_1200_ai_gain_bits,
384 ai_range_is_unipolar:labpc_1200_is_unipolar, 384 .ai_range_is_unipolar = labpc_1200_is_unipolar,
385 ai_scan_up:1, 385 .ai_scan_up = 1,
386 memory_mapped_io:0, 386 .memory_mapped_io = 0,
387 }, 387 },
388 { 388 {
389 name: "lab-pc+", 389 .name = "lab-pc+",
390 ai_speed:12000, 390 .ai_speed = 12000,
391 bustype: isa_bustype, 391 .bustype = isa_bustype,
392 register_layout:labpc_plus_layout, 392 .register_layout = labpc_plus_layout,
393 has_ao: 1, 393 .has_ao = 1,
394 ai_range_table:&range_labpc_plus_ai, 394 .ai_range_table = &range_labpc_plus_ai,
395 ai_range_code:labpc_plus_ai_gain_bits, 395 .ai_range_code = labpc_plus_ai_gain_bits,
396 ai_range_is_unipolar:labpc_plus_is_unipolar, 396 .ai_range_is_unipolar = labpc_plus_is_unipolar,
397 ai_scan_up:0, 397 .ai_scan_up = 0,
398 memory_mapped_io:0, 398 .memory_mapped_io = 0,
399 }, 399 },
400#ifdef CONFIG_COMEDI_PCI 400#ifdef CONFIG_COMEDI_PCI
401 { 401 {
402 name: "pci-1200", 402 .name = "pci-1200",
403 device_id:0x161, 403 .device_id = 0x161,
404 ai_speed:10000, 404 .ai_speed = 10000,
405 bustype: pci_bustype, 405 .bustype = pci_bustype,
406 register_layout:labpc_1200_layout, 406 .register_layout = labpc_1200_layout,
407 has_ao: 1, 407 .has_ao = 1,
408 ai_range_table:&range_labpc_1200_ai, 408 .ai_range_table = &range_labpc_1200_ai,
409 ai_range_code:labpc_1200_ai_gain_bits, 409 .ai_range_code = labpc_1200_ai_gain_bits,
410 ai_range_is_unipolar:labpc_1200_is_unipolar, 410 .ai_range_is_unipolar = labpc_1200_is_unipolar,
411 ai_scan_up:1, 411 .ai_scan_up = 1,
412 memory_mapped_io:1, 412 .memory_mapped_io = 1,
413 }, 413 },
414 /* dummy entry so pci board works when comedi_config is passed driver name */ 414 /* dummy entry so pci board works when comedi_config is passed driver name */
415 { 415 {
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index e504f4f594a..41538c3c80f 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -83,31 +83,31 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it);
83 83
84static const struct labpc_board_struct labpc_cs_boards[] = { 84static const struct labpc_board_struct labpc_cs_boards[] = {
85 { 85 {
86 name: "daqcard-1200", 86 .name = "daqcard-1200",
87 device_id:0x103, /* 0x10b is manufacturer id, 0x103 is device id */ 87 .device_id = 0x103, /* 0x10b is manufacturer id, 0x103 is device id */
88 ai_speed:10000, 88 .ai_speed = 10000,
89 bustype: pcmcia_bustype, 89 .bustype = pcmcia_bustype,
90 register_layout:labpc_1200_layout, 90 .register_layout = labpc_1200_layout,
91 has_ao: 1, 91 .has_ao = 1,
92 ai_range_table:&range_labpc_1200_ai, 92 .ai_range_table = &range_labpc_1200_ai,
93 ai_range_code:labpc_1200_ai_gain_bits, 93 .ai_range_code = labpc_1200_ai_gain_bits,
94 ai_range_is_unipolar:labpc_1200_is_unipolar, 94 .ai_range_is_unipolar = labpc_1200_is_unipolar,
95 ai_scan_up:0, 95 .ai_scan_up = 0,
96 memory_mapped_io:0, 96 .memory_mapped_io = 0,
97 }, 97 },
98 /* duplicate entry, to support using alternate name */ 98 /* duplicate entry, to support using alternate name */
99 { 99 {
100 name: "ni_labpc_cs", 100 .name = "ni_labpc_cs",
101 device_id:0x103, 101 .device_id = 0x103,
102 ai_speed:10000, 102 .ai_speed = 10000,
103 bustype: pcmcia_bustype, 103 .bustype = pcmcia_bustype,
104 register_layout:labpc_1200_layout, 104 .register_layout = labpc_1200_layout,
105 has_ao: 1, 105 .has_ao = 1,
106 ai_range_table:&range_labpc_1200_ai, 106 .ai_range_table = &range_labpc_1200_ai,
107 ai_range_code:labpc_1200_ai_gain_bits, 107 .ai_range_code = labpc_1200_ai_gain_bits,
108 ai_range_is_unipolar:labpc_1200_is_unipolar, 108 .ai_range_is_unipolar = labpc_1200_is_unipolar,
109 ai_scan_up:0, 109 .ai_scan_up = 0,
110 memory_mapped_io:0, 110 .memory_mapped_io = 0,
111 }, 111 },
112}; 112};
113 113
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index a7ab3f72c7a..fe6af0aa3dc 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -67,102 +67,102 @@ See the notes in the ni_atmio.o driver.
67#define MAX_N_CALDACS 32 67#define MAX_N_CALDACS 32
68 68
69static const struct ni_board_struct ni_boards[] = { 69static const struct ni_board_struct ni_boards[] = {
70 {device_id:0x010d, 70 {.device_id = 0x010d,
71 name: "DAQCard-ai-16xe-50", 71 .name = "DAQCard-ai-16xe-50",
72 n_adchan:16, 72 .n_adchan = 16,
73 adbits: 16, 73 .adbits = 16,
74 ai_fifo_depth:1024, 74 .ai_fifo_depth = 1024,
75 alwaysdither:0, 75 .alwaysdither = 0,
76 gainlkup:ai_gain_8, 76 .gainlkup = ai_gain_8,
77 ai_speed:5000, 77 .ai_speed = 5000,
78 n_aochan:0, 78 .n_aochan = 0,
79 aobits: 0, 79 .aobits = 0,
80 ao_fifo_depth:0, 80 .ao_fifo_depth = 0,
81 ao_unipolar:0, 81 .ao_unipolar = 0,
82 num_p0_dio_channels:8, 82 .num_p0_dio_channels = 8,
83 has_8255:0, 83 .has_8255 = 0,
84 caldac: {dac8800, dac8043}, 84 .caldac = {dac8800, dac8043},
85 }, 85 },
86 {device_id:0x010c, 86 {.device_id = 0x010c,
87 name: "DAQCard-ai-16e-4", 87 .name = "DAQCard-ai-16e-4",
88 n_adchan:16, 88 .n_adchan = 16,
89 adbits: 12, 89 .adbits = 12,
90 ai_fifo_depth:1024, 90 .ai_fifo_depth = 1024,
91 alwaysdither:0, 91 .alwaysdither = 0,
92 gainlkup:ai_gain_16, 92 .gainlkup = ai_gain_16,
93 ai_speed:4000, 93 .ai_speed = 4000,
94 n_aochan:0, 94 .n_aochan = 0,
95 aobits: 0, 95 .aobits = 0,
96 ao_fifo_depth:0, 96 .ao_fifo_depth = 0,
97 ao_unipolar:0, 97 .ao_unipolar = 0,
98 num_p0_dio_channels:8, 98 .num_p0_dio_channels = 8,
99 has_8255:0, 99 .has_8255 = 0,
100 caldac: {mb88341}, /* verified */ 100 .caldac = {mb88341}, /* verified */
101 }, 101 },
102 {device_id:0x02c4, 102 {.device_id = 0x02c4,
103 name: "DAQCard-6062E", 103 .name = "DAQCard-6062E",
104 n_adchan:16, 104 .n_adchan = 16,
105 adbits: 12, 105 .adbits = 12,
106 ai_fifo_depth:8192, 106 .ai_fifo_depth = 8192,
107 alwaysdither:0, 107 .alwaysdither = 0,
108 gainlkup:ai_gain_16, 108 .gainlkup = ai_gain_16,
109 ai_speed:2000, 109 .ai_speed = 2000,
110 n_aochan:2, 110 .n_aochan = 2,
111 aobits: 12, 111 .aobits = 12,
112 ao_fifo_depth:2048, 112 .ao_fifo_depth = 2048,
113 ao_range_table:&range_bipolar10, 113 .ao_range_table = &range_bipolar10,
114 ao_unipolar:0, 114 .ao_unipolar = 0,
115 ao_speed:1176, 115 .ao_speed = 1176,
116 num_p0_dio_channels:8, 116 .num_p0_dio_channels = 8,
117 has_8255:0, 117 .has_8255 = 0,
118 caldac: {ad8804_debug}, /* verified */ 118 .caldac = {ad8804_debug}, /* verified */
119 }, 119 },
120 {device_id:0x075e, 120 {.device_id = 0x075e,
121 name: "DAQCard-6024E", /* specs incorrect! */ 121 .name = "DAQCard-6024E", /* specs incorrect! */
122 n_adchan:16, 122 .n_adchan = 16,
123 adbits: 12, 123 .adbits = 12,
124 ai_fifo_depth:1024, 124 .ai_fifo_depth = 1024,
125 alwaysdither:0, 125 .alwaysdither = 0,
126 gainlkup:ai_gain_16, 126 .gainlkup = ai_gain_16,
127 ai_speed:5000, 127 .ai_speed = 5000,
128 n_aochan:2, 128 .n_aochan = 2,
129 aobits: 12, 129 .aobits = 12,
130 ao_fifo_depth:0, 130 .ao_fifo_depth = 0,
131 ao_range_table:&range_bipolar10, 131 .ao_range_table = &range_bipolar10,
132 ao_unipolar:0, 132 .ao_unipolar = 0,
133 ao_speed:1000000, 133 .ao_speed = 1000000,
134 num_p0_dio_channels:8, 134 .num_p0_dio_channels = 8,
135 has_8255:0, 135 .has_8255 = 0,
136 caldac: {ad8804_debug}, 136 .caldac = {ad8804_debug},
137 }, 137 },
138 {device_id:0x0245, 138 {.device_id = 0x0245,
139 name: "DAQCard-6036E", /* specs incorrect! */ 139 .name = "DAQCard-6036E", /* specs incorrect! */
140 n_adchan:16, 140 .n_adchan = 16,
141 adbits: 16, 141 .adbits = 16,
142 ai_fifo_depth:1024, 142 .ai_fifo_depth = 1024,
143 alwaysdither:1, 143 .alwaysdither = 1,
144 gainlkup:ai_gain_4, 144 .gainlkup = ai_gain_4,
145 ai_speed:5000, 145 .ai_speed = 5000,
146 n_aochan:2, 146 .n_aochan = 2,
147 aobits: 16, 147 .aobits = 16,
148 ao_fifo_depth:0, 148 .ao_fifo_depth = 0,
149 ao_range_table:&range_bipolar10, 149 .ao_range_table = &range_bipolar10,
150 ao_unipolar:0, 150 .ao_unipolar = 0,
151 ao_speed:1000000, 151 .ao_speed = 1000000,
152 num_p0_dio_channels:8, 152 .num_p0_dio_channels = 8,
153 has_8255:0, 153 .has_8255 = 0,
154 caldac: {ad8804_debug}, 154 .caldac = {ad8804_debug},
155 }, 155 },
156#if 0 156#if 0
157 {device_id:0x0000, /* unknown */ 157 {.device_id = 0x0000, /* unknown */
158 name: "DAQCard-6715", 158 .name = "DAQCard-6715",
159 n_adchan:0, 159 .n_adchan = 0,
160 n_aochan:8, 160 .n_aochan = 8,
161 aobits: 12, 161 .aobits = 12,
162 ao_671x: 8192, 162 .ao_671x = 8192,
163 num_p0_dio_channels:8, 163 .num_p0_dio_channels = 8,
164 caldac: {mb88341, mb88341}, 164 .caldac = {mb88341, mb88341},
165 }, 165 },
166#endif 166#endif
167 /* N.B. Update ni_mio_cs_ids[] when entries added above. */ 167 /* N.B. Update ni_mio_cs_ids[] when entries added above. */
168}; 168};
@@ -230,10 +230,10 @@ static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr)
230static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it); 230static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it);
231static int mio_cs_detach(struct comedi_device *dev); 231static int mio_cs_detach(struct comedi_device *dev);
232static struct comedi_driver driver_ni_mio_cs = { 232static struct comedi_driver driver_ni_mio_cs = {
233 driver_name:"ni_mio_cs", 233 .driver_name = "ni_mio_cs",
234 module:THIS_MODULE, 234 .module = THIS_MODULE,
235 attach:mio_cs_attach, 235 .attach = mio_cs_attach,
236 detach:mio_cs_detach, 236 .detach = mio_cs_detach,
237}; 237};
238 238
239#include "ni_mio_common.c" 239#include "ni_mio_common.c"
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index ffd619b0916..773ba0e07f8 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -292,10 +292,10 @@ static int nidio_detach(struct comedi_device *dev);
292static int ni_pcidio_cancel(struct comedi_device *dev, struct comedi_subdevice *s); 292static int ni_pcidio_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
293 293
294static struct comedi_driver driver_pcidio = { 294static struct comedi_driver driver_pcidio = {
295 driver_name:"ni_pcidio", 295 .driver_name = "ni_pcidio",
296 module:THIS_MODULE, 296 .module = THIS_MODULE,
297 attach:nidio_attach, 297 .attach = nidio_attach,
298 detach:nidio_detach, 298 .detach = nidio_detach,
299}; 299};
300 300
301struct nidio_board { 301struct nidio_board {
@@ -309,65 +309,65 @@ struct nidio_board {
309 309
310static const struct nidio_board nidio_boards[] = { 310static const struct nidio_board nidio_boards[] = {
311 { 311 {
312 dev_id: 0x1150, 312 .dev_id = 0x1150,
313 name: "pci-dio-32hs", 313 .name = "pci-dio-32hs",
314 n_8255: 0, 314 .n_8255 = 0,
315 is_diodaq:1, 315 .is_diodaq = 1,
316 }, 316 },
317 { 317 {
318 dev_id: 0x1320, 318 .dev_id = 0x1320,
319 name: "pxi-6533", 319 .name = "pxi-6533",
320 n_8255: 0, 320 .n_8255 = 0,
321 is_diodaq:1, 321 .is_diodaq = 1,
322 }, 322 },
323 { 323 {
324 dev_id: 0x12b0, 324 .dev_id = 0x12b0,
325 name: "pci-6534", 325 .name = "pci-6534",
326 n_8255: 0, 326 .n_8255 = 0,
327 is_diodaq:1, 327 .is_diodaq = 1,
328 uses_firmware:1, 328 .uses_firmware = 1,
329 }, 329 },
330 { 330 {
331 dev_id: 0x0160, 331 .dev_id = 0x0160,
332 name: "pci-dio-96", 332 .name = "pci-dio-96",
333 n_8255: 4, 333 .n_8255 = 4,
334 is_diodaq:0, 334 .is_diodaq = 0,
335 }, 335 },
336 { 336 {
337 dev_id: 0x1630, 337 .dev_id = 0x1630,
338 name: "pci-dio-96b", 338 .name = "pci-dio-96b",
339 n_8255: 4, 339 .n_8255 = 4,
340 is_diodaq:0, 340 .is_diodaq = 0,
341 }, 341 },
342 { 342 {
343 dev_id: 0x13c0, 343 .dev_id = 0x13c0,
344 name: "pxi-6508", 344 .name = "pxi-6508",
345 n_8255: 4, 345 .n_8255 = 4,
346 is_diodaq:0, 346 .is_diodaq = 0,
347 }, 347 },
348 { 348 {
349 dev_id: 0x0400, 349 .dev_id = 0x0400,
350 name: "pci-6503", 350 .name = "pci-6503",
351 n_8255: 1, 351 .n_8255 = 1,
352 is_diodaq:0, 352 .is_diodaq = 0,
353 }, 353 },
354 { 354 {
355 dev_id: 0x1250, 355 .dev_id = 0x1250,
356 name: "pci-6503b", 356 .name = "pci-6503b",
357 n_8255: 1, 357 .n_8255 = 1,
358 is_diodaq:0, 358 .is_diodaq = 0,
359 }, 359 },
360 { 360 {
361 dev_id: 0x17d0, 361 .dev_id = 0x17d0,
362 name: "pci-6503x", 362 .name = "pci-6503x",
363 n_8255: 1, 363 .n_8255 = 1,
364 is_diodaq:0, 364 .is_diodaq = 0,
365 }, 365 },
366 { 366 {
367 dev_id: 0x1800, 367 .dev_id = 0x1800,
368 name: "pxi-6503", 368 .name = "pxi-6503",
369 n_8255: 1, 369 .n_8255 = 1,
370 is_diodaq:0, 370 .is_diodaq = 0,
371 }, 371 },
372}; 372};
373 373
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index bfccafe6080..17fcdce6657 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -320,7 +320,7 @@ static const struct ni_board_struct ni_boards[] = {
320 .ai_fifo_depth = 512, 320 .ai_fifo_depth = 512,
321 .alwaysdither = 0, 321 .alwaysdither = 0,
322 .gainlkup = ai_gain_16, 322 .gainlkup = ai_gain_16,
323 /* Note: there have been reported problems with full speed 323 /* .Note = there have been reported problems with full speed
324 * on this board */ 324 * on this board */
325 .ai_speed = 2000, 325 .ai_speed = 2000,
326 .n_aochan = 2, 326 .n_aochan = 2,
@@ -846,7 +846,7 @@ static const struct ni_board_struct ni_boards[] = {
846 .n_adchan = 16, 846 .n_adchan = 16,
847 .adbits = 16, 847 .adbits = 16,
848 .ai_fifo_depth = 512, 848 .ai_fifo_depth = 512,
849 /* FIXME: guess */ 849 /* .FIXME = guess */
850 .gainlkup = ai_gain_622x, 850 .gainlkup = ai_gain_622x,
851 .ai_speed = 4000, 851 .ai_speed = 4000,
852 .n_aochan = 0, 852 .n_aochan = 0,
@@ -1210,10 +1210,10 @@ static const struct ni_board_struct ni_boards[] = {
1210static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it); 1210static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it);
1211static int pcimio_detach(struct comedi_device *dev); 1211static int pcimio_detach(struct comedi_device *dev);
1212static struct comedi_driver driver_pcimio = { 1212static struct comedi_driver driver_pcimio = {
1213 driver_name: DRV_NAME, 1213 .driver_name = DRV_NAME,
1214 module:THIS_MODULE, 1214 .module = THIS_MODULE,
1215 attach:pcimio_attach, 1215 .attach = pcimio_attach,
1216 detach:pcimio_detach, 1216 .detach = pcimio_detach,
1217}; 1217};
1218 1218
1219COMEDI_PCI_INITCLEANUP(driver_pcimio, ni_pci_table) 1219COMEDI_PCI_INITCLEANUP(driver_pcimio, ni_pci_table)
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index e1a4917fc3c..c5bcd641aa1 100644
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -159,13 +159,13 @@ static const struct pcl711_board boardtypes[] = {
159static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it); 159static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it);
160static int pcl711_detach(struct comedi_device *dev); 160static int pcl711_detach(struct comedi_device *dev);
161static struct comedi_driver driver_pcl711 = { 161static struct comedi_driver driver_pcl711 = {
162 driver_name:"pcl711", 162 .driver_name = "pcl711",
163 module:THIS_MODULE, 163 .module = THIS_MODULE,
164 attach:pcl711_attach, 164 .attach = pcl711_attach,
165 detach:pcl711_detach, 165 .detach = pcl711_detach,
166 board_name:&boardtypes[0].name, 166 .board_name = &boardtypes[0].name,
167 num_names:n_boardtypes, 167 .num_names = n_boardtypes,
168 offset:sizeof(struct pcl711_board), 168 .offset = sizeof(struct pcl711_board),
169}; 169};
170 170
171COMEDI_INITCLEANUP(driver_pcl711); 171COMEDI_INITCLEANUP(driver_pcl711);
diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c
index 5d3ba759e86..b970d3d1914 100644
--- a/drivers/staging/comedi/drivers/pcl724.c
+++ b/drivers/staging/comedi/drivers/pcl724.c
@@ -84,13 +84,13 @@ static const struct pcl724_board boardtypes[] = {
84#define this_board ((const struct pcl724_board *)dev->board_ptr) 84#define this_board ((const struct pcl724_board *)dev->board_ptr)
85 85
86static struct comedi_driver driver_pcl724 = { 86static struct comedi_driver driver_pcl724 = {
87 driver_name:"pcl724", 87 .driver_name = "pcl724",
88 module:THIS_MODULE, 88 .module = THIS_MODULE,
89 attach:pcl724_attach, 89 .attach = pcl724_attach,
90 detach:pcl724_detach, 90 .detach = pcl724_detach,
91 board_name:&boardtypes[0].name, 91 .board_name = &boardtypes[0].name,
92 num_names:n_boardtypes, 92 .num_names = n_boardtypes,
93 offset:sizeof(struct pcl724_board), 93 .offset = sizeof(struct pcl724_board),
94}; 94};
95 95
96COMEDI_INITCLEANUP(driver_pcl724); 96COMEDI_INITCLEANUP(driver_pcl724);
diff --git a/drivers/staging/comedi/drivers/pcl725.c b/drivers/staging/comedi/drivers/pcl725.c
index 0941dc157a8..1347624d051 100644
--- a/drivers/staging/comedi/drivers/pcl725.c
+++ b/drivers/staging/comedi/drivers/pcl725.c
@@ -23,10 +23,10 @@ Devices: [Advantech] PCL-725 (pcl725)
23static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it); 23static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it);
24static int pcl725_detach(struct comedi_device *dev); 24static int pcl725_detach(struct comedi_device *dev);
25static struct comedi_driver driver_pcl725 = { 25static struct comedi_driver driver_pcl725 = {
26 driver_name:"pcl725", 26 .driver_name = "pcl725",
27 module:THIS_MODULE, 27 .module = THIS_MODULE,
28 attach:pcl725_attach, 28 .attach = pcl725_attach,
29 detach:pcl725_detach, 29 .detach = pcl725_detach,
30}; 30};
31 31
32COMEDI_INITCLEANUP(driver_pcl725); 32COMEDI_INITCLEANUP(driver_pcl725);
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c
index 408f1ef664f..c3ce26b8d79 100644
--- a/drivers/staging/comedi/drivers/pcl726.c
+++ b/drivers/staging/comedi/drivers/pcl726.c
@@ -152,13 +152,13 @@ static const struct pcl726_board boardtypes[] = {
152#define this_board ((const struct pcl726_board *)dev->board_ptr) 152#define this_board ((const struct pcl726_board *)dev->board_ptr)
153 153
154static struct comedi_driver driver_pcl726 = { 154static struct comedi_driver driver_pcl726 = {
155 driver_name:"pcl726", 155 .driver_name = "pcl726",
156 module:THIS_MODULE, 156 .module = THIS_MODULE,
157 attach:pcl726_attach, 157 .attach = pcl726_attach,
158 detach:pcl726_detach, 158 .detach = pcl726_detach,
159 board_name:&boardtypes[0].name, 159 .board_name = &boardtypes[0].name,
160 num_names:n_boardtypes, 160 .num_names = n_boardtypes,
161 offset:sizeof(struct pcl726_board), 161 .offset = sizeof(struct pcl726_board),
162}; 162};
163 163
164COMEDI_INITCLEANUP(driver_pcl726); 164COMEDI_INITCLEANUP(driver_pcl726);
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c
index ca18cf08358..408cbffae41 100644
--- a/drivers/staging/comedi/drivers/pcl730.c
+++ b/drivers/staging/comedi/drivers/pcl730.c
@@ -46,13 +46,13 @@ static const struct pcl730_board boardtypes[] = {
46#define this_board ((const struct pcl730_board *)dev->board_ptr) 46#define this_board ((const struct pcl730_board *)dev->board_ptr)
47 47
48static struct comedi_driver driver_pcl730 = { 48static struct comedi_driver driver_pcl730 = {
49 driver_name:"pcl730", 49 .driver_name = "pcl730",
50 module:THIS_MODULE, 50 .module = THIS_MODULE,
51 attach:pcl730_attach, 51 .attach = pcl730_attach,
52 detach:pcl730_detach, 52 .detach = pcl730_detach,
53 board_name:&boardtypes[0].name, 53 .board_name = &boardtypes[0].name,
54 num_names:n_boardtypes, 54 .num_names = n_boardtypes,
55 offset:sizeof(struct pcl730_board), 55 .offset = sizeof(struct pcl730_board),
56}; 56};
57 57
58COMEDI_INITCLEANUP(driver_pcl730); 58COMEDI_INITCLEANUP(driver_pcl730);
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 6a6e84a5252..3812c2a9cb9 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -377,13 +377,13 @@ static const struct pcl812_board boardtypes[] = {
377#define this_board ((const struct pcl812_board *)dev->board_ptr) 377#define this_board ((const struct pcl812_board *)dev->board_ptr)
378 378
379static struct comedi_driver driver_pcl812 = { 379static struct comedi_driver driver_pcl812 = {
380 driver_name:"pcl812", 380 .driver_name = "pcl812",
381 module:THIS_MODULE, 381 .module = THIS_MODULE,
382 attach:pcl812_attach, 382 .attach = pcl812_attach,
383 detach:pcl812_detach, 383 .detach = pcl812_detach,
384 board_name:&boardtypes[0].name, 384 .board_name = &boardtypes[0].name,
385 num_names:n_boardtypes, 385 .num_names = n_boardtypes,
386 offset:sizeof(struct pcl812_board), 386 .offset = sizeof(struct pcl812_board),
387}; 387};
388 388
389COMEDI_INITCLEANUP(driver_pcl812); 389COMEDI_INITCLEANUP(driver_pcl812);
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index c52ba0319a4..d269ac1b5dd 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -157,13 +157,13 @@ static int RTC_timer_lock = 0; /* RTC int lock */
157#endif 157#endif
158 158
159static struct comedi_driver driver_pcl816 = { 159static struct comedi_driver driver_pcl816 = {
160 driver_name:"pcl816", 160 .driver_name = "pcl816",
161 module:THIS_MODULE, 161 .module = THIS_MODULE,
162 attach:pcl816_attach, 162 .attach = pcl816_attach,
163 detach:pcl816_detach, 163 .detach = pcl816_detach,
164 board_name:&boardtypes[0].name, 164 .board_name = &boardtypes[0].name,
165 num_names:n_boardtypes, 165 .num_names = n_boardtypes,
166 offset:sizeof(struct pcl816_board), 166 .offset = sizeof(struct pcl816_board),
167}; 167};
168 168
169COMEDI_INITCLEANUP(driver_pcl816); 169COMEDI_INITCLEANUP(driver_pcl816);
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 6fbc9abdbd7..acca3621277 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -302,13 +302,13 @@ static const struct pcl818_board boardtypes[] = {
302#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl818_board)) 302#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl818_board))
303 303
304static struct comedi_driver driver_pcl818 = { 304static struct comedi_driver driver_pcl818 = {
305 driver_name:"pcl818", 305 .driver_name = "pcl818",
306 module:THIS_MODULE, 306 .module = THIS_MODULE,
307 attach:pcl818_attach, 307 .attach = pcl818_attach,
308 detach:pcl818_detach, 308 .detach = pcl818_detach,
309 board_name:&boardtypes[0].name, 309 .board_name = &boardtypes[0].name,
310 num_names:n_boardtypes, 310 .num_names = n_boardtypes,
311 offset:sizeof(struct pcl818_board), 311 .offset = sizeof(struct pcl818_board),
312}; 312};
313 313
314COMEDI_INITCLEANUP(driver_pcl818); 314COMEDI_INITCLEANUP(driver_pcl818);
diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c
index 36310adf5fb..a5d6b1d9a1a 100644
--- a/drivers/staging/comedi/drivers/pcm3724.c
+++ b/drivers/staging/comedi/drivers/pcm3724.c
@@ -87,13 +87,13 @@ static const struct pcm3724_board boardtypes[] = {
87#define this_board ((const struct pcm3724_board *)dev->board_ptr) 87#define this_board ((const struct pcm3724_board *)dev->board_ptr)
88 88
89static struct comedi_driver driver_pcm3724 = { 89static struct comedi_driver driver_pcm3724 = {
90 driver_name:"pcm3724", 90 .driver_name = "pcm3724",
91 module:THIS_MODULE, 91 .module = THIS_MODULE,
92 attach:pcm3724_attach, 92 .attach = pcm3724_attach,
93 detach:pcm3724_detach, 93 .detach = pcm3724_detach,
94 board_name:&boardtypes[0].name, 94 .board_name = &boardtypes[0].name,
95 num_names:n_boardtypes, 95 .num_names = n_boardtypes,
96 offset:sizeof(struct pcm3724_board), 96 .offset = sizeof(struct pcm3724_board),
97}; 97};
98 98
99COMEDI_INITCLEANUP(driver_pcm3724); 99COMEDI_INITCLEANUP(driver_pcm3724);
diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c
index 1a65af1c6e4..ae90ea4ae3c 100644
--- a/drivers/staging/comedi/drivers/pcm3730.c
+++ b/drivers/staging/comedi/drivers/pcm3730.c
@@ -31,10 +31,10 @@ Configuration options:
31static int pcm3730_attach(struct comedi_device *dev, struct comedi_devconfig *it); 31static int pcm3730_attach(struct comedi_device *dev, struct comedi_devconfig *it);
32static int pcm3730_detach(struct comedi_device *dev); 32static int pcm3730_detach(struct comedi_device *dev);
33static struct comedi_driver driver_pcm3730 = { 33static struct comedi_driver driver_pcm3730 = {
34 driver_name:"pcm3730", 34 .driver_name = "pcm3730",
35 module:THIS_MODULE, 35 .module = THIS_MODULE,
36 attach:pcm3730_attach, 36 .attach = pcm3730_attach,
37 detach:pcm3730_detach, 37 .detach = pcm3730_detach,
38}; 38};
39 39
40COMEDI_INITCLEANUP(driver_pcm3730); 40COMEDI_INITCLEANUP(driver_pcm3730);
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index f1e19cc2ac2..14f40df298e 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -58,12 +58,12 @@ struct pcmad_board_struct {
58}; 58};
59static const struct pcmad_board_struct pcmad_boards[] = { 59static const struct pcmad_board_struct pcmad_boards[] = {
60 { 60 {
61 name: "pcmad12", 61 .name = "pcmad12",
62 n_ai_bits:12, 62 .n_ai_bits = 12,
63 }, 63 },
64 { 64 {
65 name: "pcmad16", 65 .name = "pcmad16",
66 n_ai_bits:16, 66 .n_ai_bits = 16,
67 }, 67 },
68}; 68};
69 69
@@ -79,13 +79,13 @@ struct pcmad_priv_struct {
79static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it); 79static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it);
80static int pcmad_detach(struct comedi_device *dev); 80static int pcmad_detach(struct comedi_device *dev);
81static struct comedi_driver driver_pcmad = { 81static struct comedi_driver driver_pcmad = {
82 driver_name:"pcmad", 82 .driver_name = "pcmad",
83 module:THIS_MODULE, 83 .module = THIS_MODULE,
84 attach:pcmad_attach, 84 .attach = pcmad_attach,
85 detach:pcmad_detach, 85 .detach = pcmad_detach,
86 board_name:&pcmad_boards[0].name, 86 .board_name = &pcmad_boards[0].name,
87 num_names:n_pcmad_boards, 87 .num_names = n_pcmad_boards,
88 offset:sizeof(pcmad_boards[0]), 88 .offset = sizeof(pcmad_boards[0]),
89}; 89};
90 90
91COMEDI_INITCLEANUP(driver_pcmad); 91COMEDI_INITCLEANUP(driver_pcmad);
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c
index f2a959654d6..7bc4d7ef950 100644
--- a/drivers/staging/comedi/drivers/pcmda12.c
+++ b/drivers/staging/comedi/drivers/pcmda12.c
@@ -83,7 +83,7 @@ static const struct comedi_lrange pcmda12_ranges = {
83 83
84static const struct pcmda12_board pcmda12_boards[] = { 84static const struct pcmda12_board pcmda12_boards[] = {
85 { 85 {
86 name: "pcmda12", 86 .name = "pcmda12",
87 }, 87 },
88}; 88};
89 89
@@ -113,10 +113,10 @@ static int pcmda12_detach(struct comedi_device *dev);
113static void zero_chans(struct comedi_device *dev); 113static void zero_chans(struct comedi_device *dev);
114 114
115static struct comedi_driver driver = { 115static struct comedi_driver driver = {
116 driver_name:"pcmda12", 116 .driver_name = "pcmda12",
117 module:THIS_MODULE, 117 .module = THIS_MODULE,
118 attach:pcmda12_attach, 118 .attach = pcmda12_attach,
119 detach:pcmda12_detach, 119 .detach = pcmda12_detach,
120/* It is not necessary to implement the following members if you are 120/* It is not necessary to implement the following members if you are
121 * writing a driver for a ISA PnP or PCI card */ 121 * writing a driver for a ISA PnP or PCI card */
122 /* Most drivers will support multiple types of boards by 122 /* Most drivers will support multiple types of boards by
@@ -135,9 +135,9 @@ static struct comedi_driver driver = {
135 * the type of board in software. ISA PnP, PCI, and PCMCIA 135 * the type of board in software. ISA PnP, PCI, and PCMCIA
136 * devices are such boards. 136 * devices are such boards.
137 */ 137 */
138 board_name:&pcmda12_boards[0].name, 138 .board_name = &pcmda12_boards[0].name,
139 offset:sizeof(struct pcmda12_board), 139 .offset = sizeof(struct pcmda12_board),
140 num_names:sizeof(pcmda12_boards) / sizeof(struct pcmda12_board), 140 .num_names = sizeof(pcmda12_boards) / sizeof(struct pcmda12_board),
141}; 141};
142 142
143static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, 143static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 82da558fc8f..b9e8a175736 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -179,19 +179,19 @@ static const struct comedi_lrange ranges_ao =
179 179
180static const struct pcmmio_board pcmmio_boards[] = { 180static const struct pcmmio_board pcmmio_boards[] = {
181 { 181 {
182 name: "pcmmio", 182 .name = "pcmmio",
183 dio_num_asics:1, 183 .dio_num_asics = 1,
184 dio_num_ports:6, 184 .dio_num_ports = 6,
185 total_iosize:32, 185 .total_iosize = 32,
186 ai_bits: 16, 186 .ai_bits = 16,
187 ao_bits: 16, 187 .ao_bits = 16,
188 n_ai_chans:16, 188 .n_ai_chans = 16,
189 n_ao_chans:8, 189 .n_ao_chans = 8,
190 ai_range_table:&ranges_ai, 190 .ai_range_table = &ranges_ai,
191 ao_range_table:&ranges_ao, 191 .ao_range_table = &ranges_ao,
192 ai_rinsn:ai_rinsn, 192 .ai_rinsn = ai_rinsn,
193 ao_rinsn:ao_rinsn, 193 .ao_rinsn = ao_rinsn,
194 ao_winsn:ao_winsn}, 194 .ao_winsn = ao_winsn},
195}; 195};
196 196
197/* 197/*
@@ -268,10 +268,10 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
268static int pcmmio_detach(struct comedi_device *dev); 268static int pcmmio_detach(struct comedi_device *dev);
269 269
270static struct comedi_driver driver = { 270static struct comedi_driver driver = {
271 driver_name:"pcmmio", 271 .driver_name = "pcmmio",
272 module:THIS_MODULE, 272 .module = THIS_MODULE,
273 attach:pcmmio_attach, 273 .attach = pcmmio_attach,
274 detach:pcmmio_detach, 274 .detach = pcmmio_detach,
275/* It is not necessary to implement the following members if you are 275/* It is not necessary to implement the following members if you are
276 * writing a driver for a ISA PnP or PCI card */ 276 * writing a driver for a ISA PnP or PCI card */
277 /* Most drivers will support multiple types of boards by 277 /* Most drivers will support multiple types of boards by
@@ -290,9 +290,9 @@ static struct comedi_driver driver = {
290 * the type of board in software. ISA PnP, PCI, and PCMCIA 290 * the type of board in software. ISA PnP, PCI, and PCMCIA
291 * devices are such boards. 291 * devices are such boards.
292 */ 292 */
293 board_name:&pcmmio_boards[0].name, 293 .board_name = &pcmmio_boards[0].name,
294 offset:sizeof(struct pcmmio_board), 294 .offset = sizeof(struct pcmmio_board),
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,
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index cc62f518128..e02017369f7 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -155,14 +155,14 @@ struct pcmuio_board {
155 155
156static const struct pcmuio_board pcmuio_boards[] = { 156static const struct pcmuio_board pcmuio_boards[] = {
157 { 157 {
158 name: "pcmuio48", 158 .name = "pcmuio48",
159 num_asics:1, 159 .num_asics = 1,
160 num_ports:6, 160 .num_ports = 6,
161 }, 161 },
162 { 162 {
163 name: "pcmuio96", 163 .name = "pcmuio96",
164 num_asics:2, 164 .num_asics = 2,
165 num_ports:12, 165 .num_ports = 12,
166 }, 166 },
167}; 167};
168 168
@@ -226,10 +226,10 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
226static int pcmuio_detach(struct comedi_device *dev); 226static int pcmuio_detach(struct comedi_device *dev);
227 227
228static struct comedi_driver driver = { 228static struct comedi_driver driver = {
229 driver_name:"pcmuio", 229 .driver_name = "pcmuio",
230 module:THIS_MODULE, 230 .module = THIS_MODULE,
231 attach:pcmuio_attach, 231 .attach = pcmuio_attach,
232 detach:pcmuio_detach, 232 .detach = pcmuio_detach,
233/* It is not necessary to implement the following members if you are 233/* It is not necessary to implement the following members if you are
234 * writing a driver for a ISA PnP or PCI card */ 234 * writing a driver for a ISA PnP or PCI card */
235 /* Most drivers will support multiple types of boards by 235 /* Most drivers will support multiple types of boards by
@@ -248,9 +248,9 @@ static struct comedi_driver driver = {
248 * the type of board in software. ISA PnP, PCI, and PCMCIA 248 * the type of board in software. ISA PnP, PCI, and PCMCIA
249 * devices are such boards. 249 * devices are such boards.
250 */ 250 */
251 board_name:&pcmuio_boards[0].name, 251 .board_name = &pcmuio_boards[0].name,
252 offset:sizeof(struct pcmuio_board), 252 .offset = sizeof(struct pcmuio_board),
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,
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index f8f5a7366aa..47850bd1548 100644
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -70,33 +70,33 @@ struct boarddef_struct {
70}; 70};
71static const struct boarddef_struct boards[] = { 71static const struct boarddef_struct boards[] = {
72 { 72 {
73 name: "dac02", 73 .name = "dac02",
74 iosize: 8, 74 .iosize = 8,
75 /* setup: dac02_setup, */ 75 /* .setup = dac02_setup, */
76 type: COMEDI_SUBD_AO, 76 .type = COMEDI_SUBD_AO,
77 n_chan: 2, 77 .n_chan = 2,
78 n_bits: 12, 78 .n_bits = 12,
79 winsn: dac02_ao_winsn, 79 .winsn = dac02_ao_winsn,
80 rinsn: readback_insn, 80 .rinsn = readback_insn,
81 range: &range_unknown, 81 .range = &range_unknown,
82 }, 82 },
83 { 83 {
84 name: "pcl733", 84 .name = "pcl733",
85 iosize: 4, 85 .iosize = 4,
86 type: COMEDI_SUBD_DI, 86 .type = COMEDI_SUBD_DI,
87 n_chan: 32, 87 .n_chan = 32,
88 n_bits: 1, 88 .n_bits = 1,
89 insnbits:pcl733_insn_bits, 89 .insnbits = pcl733_insn_bits,
90 range: &range_digital, 90 .range = &range_digital,
91 }, 91 },
92 { 92 {
93 name: "pcl734", 93 .name = "pcl734",
94 iosize: 4, 94 .iosize = 4,
95 type: COMEDI_SUBD_DO, 95 .type = COMEDI_SUBD_DO,
96 n_chan: 32, 96 .n_chan = 32,
97 n_bits: 1, 97 .n_bits = 1,
98 insnbits:pcl734_insn_bits, 98 .insnbits = pcl734_insn_bits,
99 range: &range_digital, 99 .range = &range_digital,
100 }, 100 },
101}; 101};
102 102
@@ -104,13 +104,13 @@ static const struct boarddef_struct boards[] = {
104#define this_board ((const struct boarddef_struct *)dev->board_ptr) 104#define this_board ((const struct boarddef_struct *)dev->board_ptr)
105 105
106static struct comedi_driver driver_poc = { 106static struct comedi_driver driver_poc = {
107 driver_name:"poc", 107 .driver_name = "poc",
108 module:THIS_MODULE, 108 .module = THIS_MODULE,
109 attach:poc_attach, 109 .attach = poc_attach,
110 detach:poc_detach, 110 .detach = poc_detach,
111 board_name:&boards[0].name, 111 .board_name = &boards[0].name,
112 num_names:n_boards, 112 .num_names = n_boards,
113 offset:sizeof(boards[0]), 113 .offset = sizeof(boards[0]),
114}; 114};
115 115
116static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) 116static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index d6427e2fc14..85b53c93e13 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -179,8 +179,8 @@ static struct local_info_t *dev_table[MAX_DEV] = { NULL, /* ... */ };
179#define DAQP_AUX_FIFO_EMPTY 0x01 179#define DAQP_AUX_FIFO_EMPTY 0x01
180 180
181/* These range structures tell COMEDI how the sample values map to 181/* These range structures tell COMEDI how the sample values map to
182 * voltages. The A/D converter has four ranges: +/- 10V through 182 * voltages. The A/D converter has four .ranges = +/- 10V through
183 * +/- 1.25V, and the D/A converter has only one: +/- 5V. 183 * +/- 1.25V, and the D/A converter has only .one = +/- 5V.
184 */ 184 */
185 185
186static const struct comedi_lrange range_daqp_ai = { 4, { 186static const struct comedi_lrange range_daqp_ai = { 4, {
@@ -200,10 +200,10 @@ static const struct comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} };
200static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it); 200static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it);
201static int daqp_detach(struct comedi_device *dev); 201static int daqp_detach(struct comedi_device *dev);
202static struct comedi_driver driver_daqp = { 202static struct comedi_driver driver_daqp = {
203 driver_name:"quatech_daqp_cs", 203 .driver_name = "quatech_daqp_cs",
204 module:THIS_MODULE, 204 .module = THIS_MODULE,
205 attach:daqp_attach, 205 .attach = daqp_attach,
206 detach:daqp_detach, 206 .detach = daqp_detach,
207}; 207};
208 208
209#ifdef DAQP_DEBUG 209#ifdef DAQP_DEBUG
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index b2579f42573..57541d52a15 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -134,13 +134,13 @@ static const struct rti800_board boardtypes[] = {
134static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it); 134static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it);
135static int rti800_detach(struct comedi_device *dev); 135static int rti800_detach(struct comedi_device *dev);
136static struct comedi_driver driver_rti800 = { 136static struct comedi_driver driver_rti800 = {
137 driver_name:"rti800", 137 .driver_name = "rti800",
138 module:THIS_MODULE, 138 .module = THIS_MODULE,
139 attach:rti800_attach, 139 .attach = rti800_attach,
140 detach:rti800_detach, 140 .detach = rti800_detach,
141 num_names:sizeof(boardtypes) / sizeof(struct rti800_board), 141 .num_names = sizeof(boardtypes) / sizeof(struct rti800_board),
142 board_name:&boardtypes[0].name, 142 .board_name = &boardtypes[0].name,
143 offset:sizeof(struct rti800_board), 143 .offset = sizeof(struct rti800_board),
144}; 144};
145 145
146COMEDI_INITCLEANUP(driver_rti800); 146COMEDI_INITCLEANUP(driver_rti800);
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c
index ec64c9ee0a5..fffde45a352 100644
--- a/drivers/staging/comedi/drivers/rti802.c
+++ b/drivers/staging/comedi/drivers/rti802.c
@@ -50,10 +50,10 @@ Configuration Options:
50static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it); 50static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it);
51static int rti802_detach(struct comedi_device *dev); 51static int rti802_detach(struct comedi_device *dev);
52static struct comedi_driver driver_rti802 = { 52static struct comedi_driver driver_rti802 = {
53 driver_name:"rti802", 53 .driver_name = "rti802",
54 module:THIS_MODULE, 54 .module = THIS_MODULE,
55 attach:rti802_attach, 55 .attach = rti802_attach,
56 detach:rti802_detach, 56 .detach = rti802_detach,
57}; 57};
58 58
59COMEDI_INITCLEANUP(driver_rti802); 59COMEDI_INITCLEANUP(driver_rti802);
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index 54c24a266fb..d9b8f837bfd 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -169,14 +169,14 @@ struct s526_board {
169 169
170static const struct s526_board s526_boards[] = { 170static const struct s526_board s526_boards[] = {
171 { 171 {
172 name: "s526", 172 .name = "s526",
173 gpct_chans:4, 173 .gpct_chans = 4,
174 gpct_bits:24, 174 .gpct_bits = 24,
175 ad_chans:8, 175 .ad_chans = 8,
176 ad_bits: 16, 176 .ad_bits = 16,
177 da_chans:4, 177 .da_chans = 4,
178 da_bits: 16, 178 .da_bits = 16,
179 have_dio:1, 179 .have_dio = 1,
180 } 180 }
181}; 181};
182 182
@@ -220,10 +220,10 @@ struct s526_private {
220static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it); 220static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it);
221static int s526_detach(struct comedi_device *dev); 221static int s526_detach(struct comedi_device *dev);
222static struct comedi_driver driver_s526 = { 222static struct comedi_driver driver_s526 = {
223 driver_name:"s526", 223 .driver_name = "s526",
224 module:THIS_MODULE, 224 .module = THIS_MODULE,
225 attach:s526_attach, 225 .attach = s526_attach,
226 detach:s526_detach, 226 .detach = s526_detach,
227/* It is not necessary to implement the following members if you are 227/* It is not necessary to implement the following members if you are
228 * writing a driver for a ISA PnP or PCI card */ 228 * writing a driver for a ISA PnP or PCI card */
229 /* Most drivers will support multiple types of boards by 229 /* Most drivers will support multiple types of boards by
@@ -242,9 +242,9 @@ static struct comedi_driver driver_s526 = {
242 * the type of board in software. ISA PnP, PCI, and PCMCIA 242 * the type of board in software. ISA PnP, PCI, and PCMCIA
243 * devices are such boards. 243 * devices are such boards.
244 */ 244 */
245 board_name:&s526_boards[0].name, 245 .board_name = &s526_boards[0].name,
246 offset:sizeof(struct s526_board), 246 .offset = sizeof(struct s526_board),
247 num_names:sizeof(s526_boards) / sizeof(struct s526_board), 247 .num_names = sizeof(s526_boards) / sizeof(struct s526_board),
248}; 248};
249 249
250static int s526_gpct_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, 250static int s526_gpct_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 278d754049a..cf3e925261a 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -52,7 +52,7 @@ struct serial2002_board {
52 52
53static const struct serial2002_board serial2002_boards[] = { 53static const struct serial2002_board serial2002_boards[] = {
54 { 54 {
55 name: "serial2002"} 55 .name = "serial2002"}
56}; 56};
57 57
58/* 58/*
@@ -92,13 +92,13 @@ struct serial2002_private {
92static int serial2002_attach(struct comedi_device *dev, struct comedi_devconfig *it); 92static int serial2002_attach(struct comedi_device *dev, struct comedi_devconfig *it);
93static int serial2002_detach(struct comedi_device *dev); 93static int serial2002_detach(struct comedi_device *dev);
94struct comedi_driver driver_serial2002 = { 94struct comedi_driver driver_serial2002 = {
95 driver_name:"serial2002", 95 .driver_name = "serial2002",
96 module:THIS_MODULE, 96 .module = THIS_MODULE,
97 attach:serial2002_attach, 97 .attach = serial2002_attach,
98 detach:serial2002_detach, 98 .detach = serial2002_detach,
99 board_name:&serial2002_boards[0].name, 99 .board_name = &serial2002_boards[0].name,
100 offset:sizeof(struct serial2002_board), 100 .offset = sizeof(struct serial2002_board),
101 num_names:sizeof(serial2002_boards) / sizeof(struct serial2002_board), 101 .num_names = sizeof(serial2002_boards) / sizeof(struct serial2002_board),
102}; 102};
103 103
104static int serial2002_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, 104static int serial2002_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index fe49310941d..a0764f81917 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -97,16 +97,16 @@ struct skel_board {
97 97
98static const struct skel_board skel_boards[] = { 98static const struct skel_board skel_boards[] = {
99 { 99 {
100 name: "skel-100", 100 .name = "skel-100",
101 ai_chans:16, 101 .ai_chans = 16,
102 ai_bits: 12, 102 .ai_bits = 12,
103 have_dio:1, 103 .have_dio = 1,
104 }, 104 },
105 { 105 {
106 name: "skel-200", 106 .name = "skel-200",
107 ai_chans:8, 107 .ai_chans = 8,
108 ai_bits: 16, 108 .ai_bits = 16,
109 have_dio:0, 109 .have_dio = 0,
110 }, 110 },
111}; 111};
112 112
@@ -157,10 +157,10 @@ struct skel_private {
157static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it); 157static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it);
158static int skel_detach(struct comedi_device *dev); 158static int skel_detach(struct comedi_device *dev);
159static struct comedi_driver driver_skel = { 159static struct comedi_driver driver_skel = {
160 driver_name:"dummy", 160 .driver_name = "dummy",
161 module:THIS_MODULE, 161 .module = THIS_MODULE,
162 attach:skel_attach, 162 .attach = skel_attach,
163 detach:skel_detach, 163 .detach = skel_detach,
164/* It is not necessary to implement the following members if you are 164/* It is not necessary to implement the following members if you are
165 * writing a driver for a ISA PnP or PCI card */ 165 * writing a driver for a ISA PnP or PCI card */
166 /* Most drivers will support multiple types of boards by 166 /* Most drivers will support multiple types of boards by
@@ -179,9 +179,9 @@ static struct comedi_driver driver_skel = {
179 * the type of board in software. ISA PnP, PCI, and PCMCIA 179 * the type of board in software. ISA PnP, PCI, and PCMCIA
180 * devices are such boards. 180 * devices are such boards.
181 */ 181 */
182 board_name:&skel_boards[0].name, 182 .board_name = &skel_boards[0].name,
183 offset:sizeof(struct skel_board), 183 .offset = sizeof(struct skel_board),
184 num_names:sizeof(skel_boards) / sizeof(struct skel_board), 184 .num_names = sizeof(skel_boards) / sizeof(struct skel_board),
185}; 185};
186 186
187static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, 187static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
index 847695a6281..b12c42991bb 100644
--- a/drivers/staging/comedi/drivers/ssv_dnp.c
+++ b/drivers/staging/comedi/drivers/ssv_dnp.c
@@ -61,10 +61,10 @@ struct dnp_board {
61 61
62static const struct dnp_board dnp_boards[] = { /* we only support one DNP 'board' */ 62static const struct dnp_board dnp_boards[] = { /* we only support one DNP 'board' */
63 { /* variant at the moment */ 63 { /* variant at the moment */
64 name: "dnp-1486", 64 .name = "dnp-1486",
65 ai_chans:16, 65 .ai_chans = 16,
66 ai_bits: 12, 66 .ai_bits = 12,
67 have_dio:1, 67 .have_dio = 1,
68 }, 68 },
69}; 69};
70 70
@@ -92,14 +92,14 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it);
92static int dnp_detach(struct comedi_device *dev); 92static int dnp_detach(struct comedi_device *dev);
93 93
94static struct comedi_driver driver_dnp = { 94static struct comedi_driver driver_dnp = {
95 driver_name:"ssv_dnp", 95 .driver_name = "ssv_dnp",
96 module:THIS_MODULE, 96 .module = THIS_MODULE,
97 attach:dnp_attach, 97 .attach = dnp_attach,
98 detach:dnp_detach, 98 .detach = dnp_detach,
99 board_name:&dnp_boards[0].name, 99 .board_name = &dnp_boards[0].name,
100 /* only necessary for non-PnP devs */ 100 /* only necessary for non-PnP devs */
101 offset:sizeof(struct dnp_board),/* like ISA-PnP, PCI or PCMCIA. */ 101 .offset = sizeof(struct dnp_board),/* like ISA-PnP, PCI or PCMCIA. */
102 num_names:sizeof(dnp_boards) / sizeof(struct dnp_board), 102 .num_names = sizeof(dnp_boards) / sizeof(struct dnp_board),
103}; 103};
104 104
105COMEDI_INITCLEANUP(driver_dnp); 105COMEDI_INITCLEANUP(driver_dnp);
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 18e5ddf6f96..e308f5f8930 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -103,10 +103,10 @@ static int __unioxx5_define_chan_offset(int chan_num);
103static void __unioxx5_analog_config(struct unioxx5_subd_priv *usp, int channel); 103static void __unioxx5_analog_config(struct unioxx5_subd_priv *usp, int channel);
104 104
105static struct comedi_driver unioxx5_driver = { 105static struct comedi_driver unioxx5_driver = {
106 driver_name:DRIVER_NAME, 106 .driver_name = DRIVER_NAME,
107 module:THIS_MODULE, 107 .module = THIS_MODULE,
108 attach:unioxx5_attach, 108 .attach = unioxx5_attach,
109 detach:unioxx5_detach 109 .detach = unioxx5_detach
110}; 110};
111 111
112COMEDI_INITCLEANUP(unioxx5_driver); 112COMEDI_INITCLEANUP(unioxx5_driver);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 21:13:42 -0400