diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:06:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:58 -0400 |
commit | 0707bb04be89b18ee83b5a997e36cc585f0b988d (patch) | |
tree | f3e5a2f78592ffdf461bfb5dff3814dbb8d486ea /drivers/staging/comedi | |
parent | 063db04b8901c5cf84c552a5053748d183d34e61 (diff) |
Staging: comedi: Remove comedi_devconfig typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
109 files changed, 225 insertions, 226 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 8ed6f96442c..fe7f1c4a445 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h | |||
@@ -291,7 +291,7 @@ enum comedi_support_level { | |||
291 | /* ioctls */ | 291 | /* ioctls */ |
292 | 292 | ||
293 | #define CIO 'd' | 293 | #define CIO 'd' |
294 | #define COMEDI_DEVCONFIG _IOW(CIO, 0, comedi_devconfig) | 294 | #define COMEDI_DEVCONFIG _IOW(CIO, 0, struct comedi_devconfig) |
295 | #define COMEDI_DEVINFO _IOR(CIO, 1, struct comedi_devinfo) | 295 | #define COMEDI_DEVINFO _IOR(CIO, 1, struct comedi_devinfo) |
296 | #define COMEDI_SUBDINFO _IOR(CIO, 2, struct comedi_subdinfo) | 296 | #define COMEDI_SUBDINFO _IOR(CIO, 2, struct comedi_subdinfo) |
297 | #define COMEDI_CHANINFO _IOR(CIO, 3, struct comedi_chaninfo) | 297 | #define COMEDI_CHANINFO _IOR(CIO, 3, struct comedi_chaninfo) |
@@ -310,7 +310,6 @@ enum comedi_support_level { | |||
310 | 310 | ||
311 | /* structures */ | 311 | /* structures */ |
312 | 312 | ||
313 | typedef struct comedi_devconfig_struct comedi_devconfig; | ||
314 | typedef struct comedi_rangeinfo_struct comedi_rangeinfo; | 313 | typedef struct comedi_rangeinfo_struct comedi_rangeinfo; |
315 | typedef struct comedi_krange_struct comedi_krange; | 314 | typedef struct comedi_krange_struct comedi_krange; |
316 | typedef struct comedi_bufconfig_struct comedi_bufconfig; | 315 | typedef struct comedi_bufconfig_struct comedi_bufconfig; |
@@ -415,7 +414,7 @@ struct comedi_devinfo { | |||
415 | int unused[30]; | 414 | int unused[30]; |
416 | }; | 415 | }; |
417 | 416 | ||
418 | struct comedi_devconfig_struct { | 417 | struct comedi_devconfig { |
419 | char board_name[COMEDI_NAMELEN]; | 418 | char board_name[COMEDI_NAMELEN]; |
420 | int options[COMEDI_NDEVCONFOPTS]; | 419 | int options[COMEDI_NDEVCONFOPTS]; |
421 | }; | 420 | }; |
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 2d99a4e33b5..0e9ad62c6ec 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c | |||
@@ -69,7 +69,7 @@ static DEFINE_SPINLOCK(comedi_file_info_table_lock); | |||
69 | static struct comedi_device_file_info | 69 | static struct comedi_device_file_info |
70 | *comedi_file_info_table[COMEDI_NUM_MINORS]; | 70 | *comedi_file_info_table[COMEDI_NUM_MINORS]; |
71 | 71 | ||
72 | static int do_devconfig_ioctl(struct comedi_device *dev, comedi_devconfig *arg); | 72 | static int do_devconfig_ioctl(struct comedi_device *dev, struct comedi_devconfig *arg); |
73 | static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg); | 73 | static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg); |
74 | static int do_devinfo_ioctl(struct comedi_device *dev, struct comedi_devinfo *arg, | 74 | static int do_devinfo_ioctl(struct comedi_device *dev, struct comedi_devinfo *arg, |
75 | struct file *file); | 75 | struct file *file); |
@@ -192,9 +192,9 @@ done: | |||
192 | writes: | 192 | writes: |
193 | none | 193 | none |
194 | */ | 194 | */ |
195 | static int do_devconfig_ioctl(struct comedi_device *dev, comedi_devconfig *arg) | 195 | static int do_devconfig_ioctl(struct comedi_device *dev, struct comedi_devconfig *arg) |
196 | { | 196 | { |
197 | comedi_devconfig it; | 197 | struct comedi_devconfig it; |
198 | int ret; | 198 | int ret; |
199 | unsigned char *aux_data = NULL; | 199 | unsigned char *aux_data = NULL; |
200 | int aux_len; | 200 | int aux_len; |
@@ -213,7 +213,7 @@ static int do_devconfig_ioctl(struct comedi_device *dev, comedi_devconfig *arg) | |||
213 | return 0; | 213 | return 0; |
214 | } | 214 | } |
215 | 215 | ||
216 | if (copy_from_user(&it, arg, sizeof(comedi_devconfig))) | 216 | if (copy_from_user(&it, arg, sizeof(struct comedi_devconfig))) |
217 | return -EFAULT; | 217 | return -EFAULT; |
218 | 218 | ||
219 | it.board_name[COMEDI_NAMELEN - 1] = 0; | 219 | it.board_name[COMEDI_NAMELEN - 1] = 0; |
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 36dd82299c0..e6a3005e19d 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h | |||
@@ -239,7 +239,7 @@ struct comedi_driver { | |||
239 | 239 | ||
240 | const char *driver_name; | 240 | const char *driver_name; |
241 | struct module *module; | 241 | struct module *module; |
242 | int (*attach) (struct comedi_device *, comedi_devconfig *); | 242 | int (*attach) (struct comedi_device *, struct comedi_devconfig *); |
243 | int (*detach) (struct comedi_device *); | 243 | int (*detach) (struct comedi_device *); |
244 | 244 | ||
245 | /* number of elements in board_name and board_id arrays */ | 245 | /* number of elements in board_name and board_id arrays */ |
@@ -337,7 +337,7 @@ static inline struct comedi_subdevice *comedi_get_write_subdevice( | |||
337 | } | 337 | } |
338 | 338 | ||
339 | void comedi_device_detach(struct comedi_device *dev); | 339 | void comedi_device_detach(struct comedi_device *dev); |
340 | int comedi_device_attach(struct comedi_device *dev, comedi_devconfig *it); | 340 | int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
341 | int comedi_driver_register(struct comedi_driver *); | 341 | int comedi_driver_register(struct comedi_driver *); |
342 | int comedi_driver_unregister(struct comedi_driver *); | 342 | int comedi_driver_unregister(struct comedi_driver *); |
343 | 343 | ||
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 9728c7430f8..3e397d01ccc 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c | |||
@@ -113,7 +113,7 @@ void comedi_device_detach(struct comedi_device *dev) | |||
113 | __comedi_device_detach(dev); | 113 | __comedi_device_detach(dev); |
114 | } | 114 | } |
115 | 115 | ||
116 | int comedi_device_attach(struct comedi_device *dev, comedi_devconfig *it) | 116 | int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
117 | { | 117 | { |
118 | struct comedi_driver *driv; | 118 | struct comedi_driver *driv; |
119 | int ret; | 119 | int ret; |
@@ -791,7 +791,7 @@ void comedi_reset_async_buf(struct comedi_async *async) | |||
791 | 791 | ||
792 | int comedi_auto_config(struct device *hardware_device, const char *board_name, const int *options, unsigned num_options) | 792 | int comedi_auto_config(struct device *hardware_device, const char *board_name, const int *options, unsigned num_options) |
793 | { | 793 | { |
794 | comedi_devconfig it; | 794 | struct comedi_devconfig it; |
795 | int minor; | 795 | int minor; |
796 | struct comedi_device_file_info *dev_file_info; | 796 | struct comedi_device_file_info *dev_file_info; |
797 | int retval; | 797 | int retval; |
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c index ec5f9167110..0369c7c84ac 100644 --- a/drivers/staging/comedi/drivers/8255.c +++ b/drivers/staging/comedi/drivers/8255.c | |||
@@ -105,7 +105,7 @@ struct subdev_8255_struct { | |||
105 | #define CALLBACK_FUNC (((struct subdev_8255_struct *)s->private)->cb_func) | 105 | #define CALLBACK_FUNC (((struct subdev_8255_struct *)s->private)->cb_func) |
106 | #define subdevpriv ((struct subdev_8255_struct *)s->private) | 106 | #define subdevpriv ((struct subdev_8255_struct *)s->private) |
107 | 107 | ||
108 | static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it); | 108 | static int dev_8255_attach(struct comedi_device *dev, struct comedi_devconfig * it); |
109 | static int dev_8255_detach(struct comedi_device *dev); | 109 | static int dev_8255_detach(struct comedi_device *dev); |
110 | static struct comedi_driver driver_8255 = { | 110 | static struct comedi_driver driver_8255 = { |
111 | driver_name:"8255", | 111 | driver_name:"8255", |
@@ -374,7 +374,7 @@ void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice * s) | |||
374 | 374 | ||
375 | */ | 375 | */ |
376 | 376 | ||
377 | static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it) | 377 | static int dev_8255_attach(struct comedi_device *dev, struct comedi_devconfig * it) |
378 | { | 378 | { |
379 | int ret; | 379 | int ret; |
380 | unsigned long iobase; | 380 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c index 3e257cd9eb0..78349300ecd 100644 --- a/drivers/staging/comedi/drivers/acl7225b.c +++ b/drivers/staging/comedi/drivers/acl7225b.c | |||
@@ -22,7 +22,7 @@ Devices: [Adlink] ACL-7225b (acl7225b), [ICP] P16R16DIO (p16r16dio) | |||
22 | #define ACL7225_DI_LO 2 /* Digital input low byte (DI0-DI7) */ | 22 | #define ACL7225_DI_LO 2 /* Digital input low byte (DI0-DI7) */ |
23 | #define ACL7225_DI_HI 3 /* Digital input high byte (DI8-DI15) */ | 23 | #define ACL7225_DI_HI 3 /* Digital input high byte (DI8-DI15) */ |
24 | 24 | ||
25 | static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it); | 25 | static int acl7225b_attach(struct comedi_device *dev, struct comedi_devconfig * it); |
26 | static int acl7225b_detach(struct comedi_device *dev); | 26 | static int acl7225b_detach(struct comedi_device *dev); |
27 | 27 | ||
28 | typedef struct { | 28 | typedef struct { |
@@ -83,7 +83,7 @@ static int acl7225b_di_insn(struct comedi_device *dev, struct comedi_subdevice * | |||
83 | return 2; | 83 | return 2; |
84 | } | 84 | } |
85 | 85 | ||
86 | static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it) | 86 | static int acl7225b_attach(struct comedi_device *dev, struct comedi_devconfig * it) |
87 | { | 87 | { |
88 | struct comedi_subdevice *s; | 88 | struct comedi_subdevice *s; |
89 | int iobase, iorange; | 89 | int iobase, iorange; |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index adb5deacd94..618c69b6838 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c | |||
@@ -2542,7 +2542,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); | |||
2542 | /* | 2542 | /* |
2543 | +----------------------------------------------------------------------------+ | 2543 | +----------------------------------------------------------------------------+ |
2544 | | Function name :static int i_ADDI_Attach(struct comedi_device *dev, | | 2544 | | Function name :static int i_ADDI_Attach(struct comedi_device *dev, | |
2545 | | comedi_devconfig *it) | | 2545 | | struct comedi_devconfig *it) | |
2546 | | | | 2546 | | | |
2547 | +----------------------------------------------------------------------------+ | 2547 | +----------------------------------------------------------------------------+ |
2548 | | Task :Detects the card. | | 2548 | | Task :Detects the card. | |
@@ -2551,7 +2551,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); | |||
2551 | | allocation of data structures for the driver. | | 2551 | | allocation of data structures for the driver. | |
2552 | +----------------------------------------------------------------------------+ | 2552 | +----------------------------------------------------------------------------+ |
2553 | | Input Parameters :struct comedi_device *dev | | 2553 | | Input Parameters :struct comedi_device *dev | |
2554 | | comedi_devconfig *it | | 2554 | | struct comedi_devconfig *it | |
2555 | | | | 2555 | | | |
2556 | +----------------------------------------------------------------------------+ | 2556 | +----------------------------------------------------------------------------+ |
2557 | | Return Value : 0 | | 2557 | | Return Value : 0 | |
@@ -2559,7 +2559,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); | |||
2559 | +----------------------------------------------------------------------------+ | 2559 | +----------------------------------------------------------------------------+ |
2560 | */ | 2560 | */ |
2561 | 2561 | ||
2562 | static int i_ADDI_Attach(struct comedi_device * dev, comedi_devconfig * it) | 2562 | static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * it) |
2563 | { | 2563 | { |
2564 | struct comedi_subdevice *s; | 2564 | struct comedi_subdevice *s; |
2565 | int ret, pages, i, n_subdevices; | 2565 | int ret, pages, i, n_subdevices; |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index 2b01577683b..b3ad58e9df9 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h | |||
@@ -456,7 +456,7 @@ typedef struct { | |||
456 | static unsigned short pci_list_builded; /* set to 1 when list of card is known */ | 456 | static unsigned short pci_list_builded; /* set to 1 when list of card is known */ |
457 | 457 | ||
458 | /* Function declarations */ | 458 | /* Function declarations */ |
459 | static int i_ADDI_Attach(struct comedi_device *dev, comedi_devconfig *it); | 459 | static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it); |
460 | static int i_ADDI_Detach(struct comedi_device *dev); | 460 | static int i_ADDI_Detach(struct comedi_device *dev); |
461 | static int i_ADDI_Reset(struct comedi_device *dev); | 461 | static int i_ADDI_Reset(struct comedi_device *dev); |
462 | 462 | ||
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c index cb007315671..fa290ba4690 100644 --- a/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/drivers/staging/comedi/drivers/adl_pci6208.c | |||
@@ -106,7 +106,7 @@ typedef struct { | |||
106 | 106 | ||
107 | #define devpriv ((pci6208_private *)dev->private) | 107 | #define devpriv ((pci6208_private *)dev->private) |
108 | 108 | ||
109 | static int pci6208_attach(struct comedi_device * dev, comedi_devconfig * it); | 109 | static int pci6208_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
110 | static int pci6208_detach(struct comedi_device * dev); | 110 | static int pci6208_detach(struct comedi_device * dev); |
111 | 111 | ||
112 | #define pci6208_board_nbr \ | 112 | #define pci6208_board_nbr \ |
@@ -142,7 +142,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
142 | * in the driver structure, dev->board_ptr contains that | 142 | * in the driver structure, dev->board_ptr contains that |
143 | * address. | 143 | * address. |
144 | */ | 144 | */ |
145 | static int pci6208_attach(struct comedi_device * dev, comedi_devconfig * it) | 145 | static int pci6208_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
146 | { | 146 | { |
147 | struct comedi_subdevice *s; | 147 | struct comedi_subdevice *s; |
148 | int retval; | 148 | int retval; |
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c index 21b8ba80dac..7fe4ce14fcf 100644 --- a/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/drivers/staging/comedi/drivers/adl_pci7296.c | |||
@@ -63,7 +63,7 @@ typedef struct { | |||
63 | 63 | ||
64 | #define devpriv ((adl_pci7296_private *)dev->private) | 64 | #define devpriv ((adl_pci7296_private *)dev->private) |
65 | 65 | ||
66 | static int adl_pci7296_attach(struct comedi_device * dev, comedi_devconfig * it); | 66 | static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
67 | static int adl_pci7296_detach(struct comedi_device * dev); | 67 | static int adl_pci7296_detach(struct comedi_device * dev); |
68 | static struct comedi_driver driver_adl_pci7296 = { | 68 | static struct comedi_driver driver_adl_pci7296 = { |
69 | driver_name:"adl_pci7296", | 69 | driver_name:"adl_pci7296", |
@@ -72,7 +72,7 @@ static struct comedi_driver driver_adl_pci7296 = { | |||
72 | detach:adl_pci7296_detach, | 72 | detach:adl_pci7296_detach, |
73 | }; | 73 | }; |
74 | 74 | ||
75 | static int adl_pci7296_attach(struct comedi_device * dev, comedi_devconfig * it) | 75 | static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
76 | { | 76 | { |
77 | struct pci_dev *pcidev; | 77 | struct pci_dev *pcidev; |
78 | struct comedi_subdevice *s; | 78 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c index 6759cb39d56..8fdea81b59f 100644 --- a/drivers/staging/comedi/drivers/adl_pci7432.c +++ b/drivers/staging/comedi/drivers/adl_pci7432.c | |||
@@ -58,7 +58,7 @@ typedef struct { | |||
58 | 58 | ||
59 | #define devpriv ((adl_pci7432_private *)dev->private) | 59 | #define devpriv ((adl_pci7432_private *)dev->private) |
60 | 60 | ||
61 | static int adl_pci7432_attach(struct comedi_device * dev, comedi_devconfig * it); | 61 | static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
62 | static int adl_pci7432_detach(struct comedi_device * dev); | 62 | static int adl_pci7432_detach(struct comedi_device * dev); |
63 | static struct comedi_driver driver_adl_pci7432 = { | 63 | static struct comedi_driver driver_adl_pci7432 = { |
64 | driver_name:"adl_pci7432", | 64 | driver_name:"adl_pci7432", |
@@ -77,7 +77,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_su | |||
77 | 77 | ||
78 | /* */ | 78 | /* */ |
79 | 79 | ||
80 | static int adl_pci7432_attach(struct comedi_device * dev, comedi_devconfig * it) | 80 | static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
81 | { | 81 | { |
82 | struct pci_dev *pcidev; | 82 | struct pci_dev *pcidev; |
83 | struct comedi_subdevice *s; | 83 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c index 0c93efc761a..c401e110770 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c | |||
@@ -70,7 +70,7 @@ typedef struct { | |||
70 | 70 | ||
71 | #define devpriv ((adl_pci8164_private *)dev->private) | 71 | #define devpriv ((adl_pci8164_private *)dev->private) |
72 | 72 | ||
73 | static int adl_pci8164_attach(struct comedi_device * dev, comedi_devconfig * it); | 73 | static int adl_pci8164_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
74 | static int adl_pci8164_detach(struct comedi_device * dev); | 74 | static int adl_pci8164_detach(struct comedi_device * dev); |
75 | static struct comedi_driver driver_adl_pci8164 = { | 75 | static struct comedi_driver driver_adl_pci8164 = { |
76 | driver_name:"adl_pci8164", | 76 | driver_name:"adl_pci8164", |
@@ -103,7 +103,7 @@ static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, | |||
103 | static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, | 103 | static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, |
104 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 104 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); |
105 | 105 | ||
106 | static int adl_pci8164_attach(struct comedi_device * dev, comedi_devconfig * it) | 106 | static int adl_pci8164_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
107 | { | 107 | { |
108 | struct pci_dev *pcidev; | 108 | struct pci_dev *pcidev; |
109 | struct comedi_subdevice *s; | 109 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index f6ec5372880..cce2c830313 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c | |||
@@ -265,7 +265,7 @@ TODO: | |||
265 | // Function prototypes | 265 | // Function prototypes |
266 | // | 266 | // |
267 | 267 | ||
268 | static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it); | 268 | static int pci9111_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
269 | static int pci9111_detach(struct comedi_device * dev); | 269 | static int pci9111_detach(struct comedi_device * dev); |
270 | static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 270 | static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, |
271 | void *data, unsigned int num_bytes, unsigned int start_chan_index); | 271 | void *data, unsigned int num_bytes, unsigned int start_chan_index); |
@@ -1246,7 +1246,7 @@ static int pci9111_reset(struct comedi_device * dev) | |||
1246 | // - Declare device driver capability | 1246 | // - Declare device driver capability |
1247 | // | 1247 | // |
1248 | 1248 | ||
1249 | static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it) | 1249 | static int pci9111_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1250 | { | 1250 | { |
1251 | struct comedi_subdevice *subdevice; | 1251 | struct comedi_subdevice *subdevice; |
1252 | unsigned long io_base, io_range, lcr_io_base, lcr_io_range; | 1252 | unsigned long io_base, io_range, lcr_io_base, lcr_io_range; |
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 406eab7fd43..131498a5b69 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c | |||
@@ -178,7 +178,7 @@ static const struct comedi_lrange range_pci9118hg = { 8, { | |||
178 | 178 | ||
179 | #define PCI9118_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */ | 179 | #define PCI9118_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */ |
180 | 180 | ||
181 | static int pci9118_attach(struct comedi_device * dev, comedi_devconfig * it); | 181 | static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
182 | static int pci9118_detach(struct comedi_device * dev); | 182 | static int pci9118_detach(struct comedi_device * dev); |
183 | 183 | ||
184 | typedef struct { | 184 | typedef struct { |
@@ -1835,7 +1835,7 @@ static int pci9118_reset(struct comedi_device * dev) | |||
1835 | /* | 1835 | /* |
1836 | ============================================================================== | 1836 | ============================================================================== |
1837 | */ | 1837 | */ |
1838 | static int pci9118_attach(struct comedi_device * dev, comedi_devconfig * it) | 1838 | static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1839 | { | 1839 | { |
1840 | struct comedi_subdevice *s; | 1840 | struct comedi_subdevice *s; |
1841 | int ret, pages, i; | 1841 | int ret, pages, i; |
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c index 07eea09e81f..d112a64ad11 100644 --- a/drivers/staging/comedi/drivers/adq12b.c +++ b/drivers/staging/comedi/drivers/adq12b.c | |||
@@ -162,7 +162,7 @@ typedef struct{ | |||
162 | * the board, and also about the kernel module that contains | 162 | * the board, and also about the kernel module that contains |
163 | * the device code. | 163 | * the device code. |
164 | */ | 164 | */ |
165 | static int adq12b_attach(struct comedi_device *dev,comedi_devconfig *it); | 165 | static int adq12b_attach(struct comedi_device *dev,struct comedi_devconfig *it); |
166 | static int adq12b_detach(struct comedi_device *dev); | 166 | static int adq12b_detach(struct comedi_device *dev); |
167 | static struct comedi_driver driver_adq12b={ | 167 | static struct comedi_driver driver_adq12b={ |
168 | driver_name: "adq12b", | 168 | driver_name: "adq12b", |
@@ -184,7 +184,7 @@ static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice | |||
184 | * in the driver structure, dev->board_ptr contains that | 184 | * in the driver structure, dev->board_ptr contains that |
185 | * address. | 185 | * address. |
186 | */ | 186 | */ |
187 | static int adq12b_attach(struct comedi_device *dev,comedi_devconfig *it) | 187 | static int adq12b_attach(struct comedi_device *dev,struct comedi_devconfig *it) |
188 | { | 188 | { |
189 | struct comedi_subdevice *s; | 189 | struct comedi_subdevice *s; |
190 | unsigned long iobase; | 190 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 64aec321274..934468be44c 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c | |||
@@ -182,7 +182,7 @@ static const struct comedi_lrange range_pci171x_da = { 2, { | |||
182 | } | 182 | } |
183 | }; | 183 | }; |
184 | 184 | ||
185 | static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it); | 185 | static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
186 | static int pci1710_detach(struct comedi_device * dev); | 186 | static int pci1710_detach(struct comedi_device * dev); |
187 | 187 | ||
188 | typedef struct { | 188 | typedef struct { |
@@ -1316,7 +1316,7 @@ static int pci1710_reset(struct comedi_device * dev) | |||
1316 | /* | 1316 | /* |
1317 | ============================================================================== | 1317 | ============================================================================== |
1318 | */ | 1318 | */ |
1319 | static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it) | 1319 | static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1320 | { | 1320 | { |
1321 | struct comedi_subdevice *s; | 1321 | struct comedi_subdevice *s; |
1322 | int ret, subdev, n_subdevices; | 1322 | int ret, subdev, n_subdevices; |
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c index 002144a9f6b..f6492fa3e9a 100644 --- a/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/drivers/staging/comedi/drivers/adv_pci1723.c | |||
@@ -143,7 +143,7 @@ MODULE_DEVICE_TABLE(pci, pci1723_pci_table); | |||
143 | * the board, and also about the kernel module that contains | 143 | * the board, and also about the kernel module that contains |
144 | * the device code. | 144 | * the device code. |
145 | */ | 145 | */ |
146 | static int pci1723_attach(struct comedi_device * dev, comedi_devconfig * it); | 146 | static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
147 | static int pci1723_detach(struct comedi_device * dev); | 147 | static int pci1723_detach(struct comedi_device * dev); |
148 | 148 | ||
149 | #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) | 149 | #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) |
@@ -294,7 +294,7 @@ static int pci1723_dio_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
294 | * Attach is called by the Comedi core to configure the driver | 294 | * Attach is called by the Comedi core to configure the driver |
295 | * for a pci1723 board. | 295 | * for a pci1723 board. |
296 | */ | 296 | */ |
297 | static int pci1723_attach(struct comedi_device * dev, comedi_devconfig * it) | 297 | static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
298 | { | 298 | { |
299 | struct comedi_subdevice *s; | 299 | struct comedi_subdevice *s; |
300 | int ret, subdev, n_subdevices; | 300 | int ret, subdev, n_subdevices; |
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index 7ed30317073..8f920db83d1 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c | |||
@@ -183,7 +183,7 @@ typedef enum { | |||
183 | 183 | ||
184 | #define OMBCMD_RETRY 0x03 /* 3 times try request before error */ | 184 | #define OMBCMD_RETRY 0x03 /* 3 times try request before error */ |
185 | 185 | ||
186 | static int pci_dio_attach(struct comedi_device * dev, comedi_devconfig * it); | 186 | static int pci_dio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
187 | static int pci_dio_detach(struct comedi_device * dev); | 187 | static int pci_dio_detach(struct comedi_device * dev); |
188 | 188 | ||
189 | typedef struct { | 189 | typedef struct { |
@@ -750,7 +750,7 @@ static int pci_dio_reset(struct comedi_device * dev) | |||
750 | /* | 750 | /* |
751 | ============================================================================== | 751 | ============================================================================== |
752 | */ | 752 | */ |
753 | static int pci1760_attach(struct comedi_device * dev, comedi_devconfig * it) | 753 | static int pci1760_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
754 | { | 754 | { |
755 | struct comedi_subdevice *s; | 755 | struct comedi_subdevice *s; |
756 | int subdev = 0; | 756 | int subdev = 0; |
@@ -857,7 +857,7 @@ static int pci_dio_add_do(struct comedi_device * dev, struct comedi_subdevice * | |||
857 | /* | 857 | /* |
858 | ============================================================================== | 858 | ============================================================================== |
859 | */ | 859 | */ |
860 | static int CheckAndAllocCard(struct comedi_device * dev, comedi_devconfig * it, | 860 | static int CheckAndAllocCard(struct comedi_device * dev, struct comedi_devconfig * it, |
861 | struct pci_dev *pcidev) | 861 | struct pci_dev *pcidev) |
862 | { | 862 | { |
863 | pci_dio_private *pr, *prev; | 863 | pci_dio_private *pr, *prev; |
@@ -883,7 +883,7 @@ static int CheckAndAllocCard(struct comedi_device * dev, comedi_devconfig * it, | |||
883 | /* | 883 | /* |
884 | ============================================================================== | 884 | ============================================================================== |
885 | */ | 885 | */ |
886 | static int pci_dio_attach(struct comedi_device * dev, comedi_devconfig * it) | 886 | static int pci_dio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
887 | { | 887 | { |
888 | struct comedi_subdevice *s; | 888 | struct comedi_subdevice *s; |
889 | int ret, subdev, n_subdevices, i, j; | 889 | int ret, subdev, n_subdevices, i, j; |
diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c index 10fd18aeb3f..c3e8f99ec4e 100644 --- a/drivers/staging/comedi/drivers/aio_aio12_8.c +++ b/drivers/staging/comedi/drivers/aio_aio12_8.c | |||
@@ -161,7 +161,7 @@ static const struct comedi_lrange range_aio_aio12_8 = { | |||
161 | } | 161 | } |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static int aio_aio12_8_attach(struct comedi_device * dev, comedi_devconfig * it) | 164 | static int aio_aio12_8_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
165 | { | 165 | { |
166 | int iobase; | 166 | int iobase; |
167 | struct comedi_subdevice *s; | 167 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c index a739bfa2b59..f6979eb57a8 100644 --- a/drivers/staging/comedi/drivers/aio_iiro_16.c +++ b/drivers/staging/comedi/drivers/aio_iiro_16.c | |||
@@ -67,7 +67,7 @@ typedef struct { | |||
67 | 67 | ||
68 | #define devpriv ((aio_iiro_16_private *) dev->private) | 68 | #define devpriv ((aio_iiro_16_private *) dev->private) |
69 | 69 | ||
70 | static int aio_iiro_16_attach(struct comedi_device * dev, comedi_devconfig * it); | 70 | static int aio_iiro_16_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
71 | 71 | ||
72 | static int aio_iiro_16_detach(struct comedi_device * dev); | 72 | static int aio_iiro_16_detach(struct comedi_device * dev); |
73 | 73 | ||
@@ -87,7 +87,7 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev, | |||
87 | static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, | 87 | static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, |
88 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 88 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); |
89 | 89 | ||
90 | static int aio_iiro_16_attach(struct comedi_device * dev, comedi_devconfig * it) | 90 | static int aio_iiro_16_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
91 | { | 91 | { |
92 | int iobase; | 92 | int iobase; |
93 | struct comedi_subdevice *s; | 93 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 88c127566b8..f5f20edddae 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c | |||
@@ -473,7 +473,7 @@ typedef struct { | |||
473 | * the board, and also about the kernel module that contains | 473 | * the board, and also about the kernel module that contains |
474 | * the device code. | 474 | * the device code. |
475 | */ | 475 | */ |
476 | static int dio200_attach(struct comedi_device * dev, comedi_devconfig * it); | 476 | static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
477 | static int dio200_detach(struct comedi_device * dev); | 477 | static int dio200_detach(struct comedi_device * dev); |
478 | static struct comedi_driver driver_amplc_dio200 = { | 478 | static struct comedi_driver driver_amplc_dio200 = { |
479 | driver_name:DIO200_DRIVER_NAME, | 479 | driver_name:DIO200_DRIVER_NAME, |
@@ -1262,7 +1262,7 @@ dio200_subdev_8254_cleanup(struct comedi_device * dev, struct comedi_subdevice * | |||
1262 | * in the driver structure, dev->board_ptr contains that | 1262 | * in the driver structure, dev->board_ptr contains that |
1263 | * address. | 1263 | * address. |
1264 | */ | 1264 | */ |
1265 | static int dio200_attach(struct comedi_device * dev, comedi_devconfig * it) | 1265 | static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1266 | { | 1266 | { |
1267 | struct comedi_subdevice *s; | 1267 | struct comedi_subdevice *s; |
1268 | unsigned long iobase = 0; | 1268 | unsigned long iobase = 0; |
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index b9c883500ca..ed253482d99 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c | |||
@@ -165,7 +165,7 @@ typedef struct { | |||
165 | * the board, and also about the kernel module that contains | 165 | * the board, and also about the kernel module that contains |
166 | * the device code. | 166 | * the device code. |
167 | */ | 167 | */ |
168 | static int pc236_attach(struct comedi_device * dev, comedi_devconfig * it); | 168 | static int pc236_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
169 | static int pc236_detach(struct comedi_device * dev); | 169 | static int pc236_detach(struct comedi_device * dev); |
170 | static struct comedi_driver driver_amplc_pc236 = { | 170 | static struct comedi_driver driver_amplc_pc236 = { |
171 | driver_name:PC236_DRIVER_NAME, | 171 | driver_name:PC236_DRIVER_NAME, |
@@ -264,7 +264,7 @@ pc236_find_pci(struct comedi_device * dev, int bus, int slot, | |||
264 | * in the driver structure, dev->board_ptr contains that | 264 | * in the driver structure, dev->board_ptr contains that |
265 | * address. | 265 | * address. |
266 | */ | 266 | */ |
267 | static int pc236_attach(struct comedi_device * dev, comedi_devconfig * it) | 267 | static int pc236_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
268 | { | 268 | { |
269 | struct comedi_subdevice *s; | 269 | struct comedi_subdevice *s; |
270 | unsigned long iobase = 0; | 270 | unsigned long iobase = 0; |
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index d7c33e1403b..99db1a987ca 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c | |||
@@ -132,7 +132,7 @@ typedef struct { | |||
132 | * the board, and also about the kernel module that contains | 132 | * the board, and also about the kernel module that contains |
133 | * the device code. | 133 | * the device code. |
134 | */ | 134 | */ |
135 | static int pc263_attach(struct comedi_device * dev, comedi_devconfig * it); | 135 | static int pc263_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
136 | static int pc263_detach(struct comedi_device * dev); | 136 | static int pc263_detach(struct comedi_device * dev); |
137 | static struct comedi_driver driver_amplc_pc263 = { | 137 | static struct comedi_driver driver_amplc_pc263 = { |
138 | driver_name:PC263_DRIVER_NAME, | 138 | driver_name:PC263_DRIVER_NAME, |
@@ -219,7 +219,7 @@ pc263_find_pci(struct comedi_device * dev, int bus, int slot, | |||
219 | * in the driver structure, dev->board_ptr contains that | 219 | * in the driver structure, dev->board_ptr contains that |
220 | * address. | 220 | * address. |
221 | */ | 221 | */ |
222 | static int pc263_attach(struct comedi_device * dev, comedi_devconfig * it) | 222 | static int pc263_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
223 | { | 223 | { |
224 | struct comedi_subdevice *s; | 224 | struct comedi_subdevice *s; |
225 | unsigned long iobase = 0; | 225 | unsigned long iobase = 0; |
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index ec60574786a..f0beaa69256 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c | |||
@@ -426,7 +426,7 @@ typedef struct { | |||
426 | * the board, and also about the kernel module that contains | 426 | * the board, and also about the kernel module that contains |
427 | * the device code. | 427 | * the device code. |
428 | */ | 428 | */ |
429 | static int pci224_attach(struct comedi_device * dev, comedi_devconfig * it); | 429 | static int pci224_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
430 | static int pci224_detach(struct comedi_device * dev); | 430 | static int pci224_detach(struct comedi_device * dev); |
431 | static struct comedi_driver driver_amplc_pci224 = { | 431 | static struct comedi_driver driver_amplc_pci224 = { |
432 | driver_name:DRIVER_NAME, | 432 | driver_name:DRIVER_NAME, |
@@ -1323,7 +1323,7 @@ pci224_find_pci(struct comedi_device * dev, int bus, int slot, | |||
1323 | * in the driver structure, dev->board_ptr contains that | 1323 | * in the driver structure, dev->board_ptr contains that |
1324 | * address. | 1324 | * address. |
1325 | */ | 1325 | */ |
1326 | static int pci224_attach(struct comedi_device * dev, comedi_devconfig * it) | 1326 | static int pci224_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1327 | { | 1327 | { |
1328 | struct comedi_subdevice *s; | 1328 | struct comedi_subdevice *s; |
1329 | struct pci_dev *pci_dev; | 1329 | struct pci_dev *pci_dev; |
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 432f05ba3bc..a534763a90f 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c | |||
@@ -601,7 +601,7 @@ static const unsigned char pci230_ao_bipolar[2] = { 0, 1 }; | |||
601 | * the board, and also about the kernel module that contains | 601 | * the board, and also about the kernel module that contains |
602 | * the device code. | 602 | * the device code. |
603 | */ | 603 | */ |
604 | static int pci230_attach(struct comedi_device * dev, comedi_devconfig * it); | 604 | static int pci230_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
605 | static int pci230_detach(struct comedi_device * dev); | 605 | static int pci230_detach(struct comedi_device * dev); |
606 | static struct comedi_driver driver_amplc_pci230 = { | 606 | static struct comedi_driver driver_amplc_pci230 = { |
607 | driver_name:"amplc_pci230", | 607 | driver_name:"amplc_pci230", |
@@ -702,7 +702,7 @@ static inline void pci230_ao_write_fifo(struct comedi_device * dev, short datum, | |||
702 | * in the driver structure, dev->board_ptr contains that | 702 | * in the driver structure, dev->board_ptr contains that |
703 | * address. | 703 | * address. |
704 | */ | 704 | */ |
705 | static int pci230_attach(struct comedi_device * dev, comedi_devconfig * it) | 705 | static int pci230_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
706 | { | 706 | { |
707 | struct comedi_subdevice *s; | 707 | struct comedi_subdevice *s; |
708 | unsigned long iobase1, iobase2; | 708 | unsigned long iobase1, iobase2; |
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c index 8b10ff927d4..2efffb14610 100644 --- a/drivers/staging/comedi/drivers/c6xdigio.c +++ b/drivers/staging/comedi/drivers/c6xdigio.c | |||
@@ -97,7 +97,7 @@ union encvaluetype { | |||
97 | 97 | ||
98 | #define C6XDIGIO_TIME_OUT 20 | 98 | #define C6XDIGIO_TIME_OUT 20 |
99 | 99 | ||
100 | static int c6xdigio_attach(struct comedi_device * dev, comedi_devconfig * it); | 100 | static int c6xdigio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
101 | static int c6xdigio_detach(struct comedi_device * dev); | 101 | static int c6xdigio_detach(struct comedi_device * dev); |
102 | struct comedi_driver driver_c6xdigio = { | 102 | struct comedi_driver driver_c6xdigio = { |
103 | driver_name:"c6xdigio", | 103 | driver_name:"c6xdigio", |
@@ -428,7 +428,7 @@ static struct pnp_driver c6xdigio_pnp_driver = { | |||
428 | .id_table = c6xdigio_pnp_tbl, | 428 | .id_table = c6xdigio_pnp_tbl, |
429 | }; | 429 | }; |
430 | 430 | ||
431 | static int c6xdigio_attach(struct comedi_device * dev, comedi_devconfig * it) | 431 | static int c6xdigio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
432 | { | 432 | { |
433 | int result = 0; | 433 | int result = 0; |
434 | unsigned long iobase; | 434 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index df77102cfa5..487ae3bd21d 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c | |||
@@ -89,7 +89,7 @@ typedef struct { | |||
89 | } das16cs_private; | 89 | } das16cs_private; |
90 | #define devpriv ((das16cs_private *)dev->private) | 90 | #define devpriv ((das16cs_private *)dev->private) |
91 | 91 | ||
92 | static int das16cs_attach(struct comedi_device * dev, comedi_devconfig * it); | 92 | static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
93 | static int das16cs_detach(struct comedi_device * dev); | 93 | static int das16cs_detach(struct comedi_device * dev); |
94 | static struct comedi_driver driver_das16cs = { | 94 | static struct comedi_driver driver_das16cs = { |
95 | driver_name:"cb_das16_cs", | 95 | driver_name:"cb_das16_cs", |
@@ -165,7 +165,7 @@ static const das16cs_board *das16cs_probe(struct comedi_device * dev, | |||
165 | return NULL; | 165 | return NULL; |
166 | } | 166 | } |
167 | 167 | ||
168 | static int das16cs_attach(struct comedi_device * dev, comedi_devconfig * it) | 168 | static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
169 | { | 169 | { |
170 | struct pcmcia_device *link; | 170 | struct pcmcia_device *link; |
171 | struct comedi_subdevice *s; | 171 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index f2d09e3e7fa..b0366e81445 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c | |||
@@ -440,7 +440,7 @@ typedef struct { | |||
440 | * the board, and also about the kernel module that contains | 440 | * the board, and also about the kernel module that contains |
441 | * the device code. | 441 | * the device code. |
442 | */ | 442 | */ |
443 | static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it); | 443 | static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
444 | static int cb_pcidas_detach(struct comedi_device * dev); | 444 | static int cb_pcidas_detach(struct comedi_device * dev); |
445 | static struct comedi_driver driver_cb_pcidas = { | 445 | static struct comedi_driver driver_cb_pcidas = { |
446 | driver_name:"cb_pcidas", | 446 | driver_name:"cb_pcidas", |
@@ -508,7 +508,7 @@ static inline unsigned int cal_enable_bits(struct comedi_device * dev) | |||
508 | * Attach is called by the Comedi core to configure the driver | 508 | * Attach is called by the Comedi core to configure the driver |
509 | * for a particular board. | 509 | * for a particular board. |
510 | */ | 510 | */ |
511 | static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it) | 511 | static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
512 | { | 512 | { |
513 | struct comedi_subdevice *s; | 513 | struct comedi_subdevice *s; |
514 | struct pci_dev *pcidev; | 514 | struct pci_dev *pcidev; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 40d97134e38..b6fc5c11970 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c | |||
@@ -1125,7 +1125,7 @@ static inline pcidas64_private *priv(struct comedi_device * dev) | |||
1125 | * the board, and also about the kernel module that contains | 1125 | * the board, and also about the kernel module that contains |
1126 | * the device code. | 1126 | * the device code. |
1127 | */ | 1127 | */ |
1128 | static int attach(struct comedi_device * dev, comedi_devconfig * it); | 1128 | static int attach(struct comedi_device * dev, struct comedi_devconfig * it); |
1129 | static int detach(struct comedi_device * dev); | 1129 | static int detach(struct comedi_device * dev); |
1130 | static struct comedi_driver driver_cb_pcidas = { | 1130 | static struct comedi_driver driver_cb_pcidas = { |
1131 | driver_name:"cb_pcidas64", | 1131 | driver_name:"cb_pcidas64", |
@@ -1673,7 +1673,7 @@ static inline void warn_external_queue(struct comedi_device * dev) | |||
1673 | * Attach is called by the Comedi core to configure the driver | 1673 | * Attach is called by the Comedi core to configure the driver |
1674 | * for a particular board. | 1674 | * for a particular board. |
1675 | */ | 1675 | */ |
1676 | static int attach(struct comedi_device * dev, comedi_devconfig * it) | 1676 | static int attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1677 | { | 1677 | { |
1678 | struct pci_dev *pcidev; | 1678 | struct pci_dev *pcidev; |
1679 | int index; | 1679 | int index; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index ade2ef1cbbd..27f46a609e3 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c | |||
@@ -232,7 +232,7 @@ typedef struct { | |||
232 | */ | 232 | */ |
233 | #define devpriv ((cb_pcidda_private *)dev->private) | 233 | #define devpriv ((cb_pcidda_private *)dev->private) |
234 | 234 | ||
235 | static int cb_pcidda_attach(struct comedi_device * dev, comedi_devconfig * it); | 235 | static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
236 | static int cb_pcidda_detach(struct comedi_device * dev); | 236 | static int cb_pcidda_detach(struct comedi_device * dev); |
237 | //static int cb_pcidda_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); | 237 | //static int cb_pcidda_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); |
238 | static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 238 | static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, |
@@ -265,7 +265,7 @@ static struct comedi_driver driver_cb_pcidda = { | |||
265 | * Attach is called by the Comedi core to configure the driver | 265 | * Attach is called by the Comedi core to configure the driver |
266 | * for a particular board. | 266 | * for a particular board. |
267 | */ | 267 | */ |
268 | static int cb_pcidda_attach(struct comedi_device * dev, comedi_devconfig * it) | 268 | static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
269 | { | 269 | { |
270 | struct comedi_subdevice *s; | 270 | struct comedi_subdevice *s; |
271 | struct pci_dev *pcidev; | 271 | struct pci_dev *pcidev; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c index 61da4f0bab5..a34dc9543f9 100644 --- a/drivers/staging/comedi/drivers/cb_pcidio.c +++ b/drivers/staging/comedi/drivers/cb_pcidio.c | |||
@@ -127,7 +127,7 @@ typedef struct { | |||
127 | * the board, and also about the kernel module that contains | 127 | * the board, and also about the kernel module that contains |
128 | * the device code. | 128 | * the device code. |
129 | */ | 129 | */ |
130 | static int pcidio_attach(struct comedi_device * dev, comedi_devconfig * it); | 130 | static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
131 | static int pcidio_detach(struct comedi_device * dev); | 131 | static int pcidio_detach(struct comedi_device * dev); |
132 | static struct comedi_driver driver_cb_pcidio = { | 132 | static struct comedi_driver driver_cb_pcidio = { |
133 | driver_name:"cb_pcidio", | 133 | driver_name:"cb_pcidio", |
@@ -166,7 +166,7 @@ static struct comedi_driver driver_cb_pcidio = { | |||
166 | * in the driver structure, dev->board_ptr contains that | 166 | * in the driver structure, dev->board_ptr contains that |
167 | * address. | 167 | * address. |
168 | */ | 168 | */ |
169 | static int pcidio_attach(struct comedi_device * dev, comedi_devconfig * it) | 169 | static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
170 | { | 170 | { |
171 | struct pci_dev *pcidev = NULL; | 171 | struct pci_dev *pcidev = NULL; |
172 | int index; | 172 | int index; |
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c index ab588d15f57..dcd56f80994 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c | |||
@@ -175,7 +175,7 @@ typedef struct { | |||
175 | * the board, and also about the kernel module that contains | 175 | * the board, and also about the kernel module that contains |
176 | * the device code. | 176 | * the device code. |
177 | */ | 177 | */ |
178 | static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it); | 178 | static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
179 | static int cb_pcimdas_detach(struct comedi_device * dev); | 179 | static int cb_pcimdas_detach(struct comedi_device * dev); |
180 | static struct comedi_driver driver_cb_pcimdas = { | 180 | static struct comedi_driver driver_cb_pcimdas = { |
181 | driver_name:"cb_pcimdas", | 181 | driver_name:"cb_pcimdas", |
@@ -197,7 +197,7 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
197 | * in the driver structure, dev->board_ptr contains that | 197 | * in the driver structure, dev->board_ptr contains that |
198 | * address. | 198 | * address. |
199 | */ | 199 | */ |
200 | static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it) | 200 | static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
201 | { | 201 | { |
202 | struct comedi_subdevice *s; | 202 | struct comedi_subdevice *s; |
203 | struct pci_dev *pcidev; | 203 | struct pci_dev *pcidev; |
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c index dfbdcfaa49a..c4600d0c9bc 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/drivers/staging/comedi/drivers/cb_pcimdda.c | |||
@@ -181,7 +181,7 @@ typedef struct { | |||
181 | * the board, and also about the kernel module that contains | 181 | * the board, and also about the kernel module that contains |
182 | * the device code. | 182 | * the device code. |
183 | */ | 183 | */ |
184 | static int attach(struct comedi_device * dev, comedi_devconfig * it); | 184 | static int attach(struct comedi_device * dev, struct comedi_devconfig * it); |
185 | static int detach(struct comedi_device * dev); | 185 | static int detach(struct comedi_device * dev); |
186 | static struct comedi_driver cb_pcimdda_driver = { | 186 | static struct comedi_driver cb_pcimdda_driver = { |
187 | driver_name:"cb_pcimdda", | 187 | driver_name:"cb_pcimdda", |
@@ -226,7 +226,7 @@ static inline unsigned int figure_out_maxdata(int bits) | |||
226 | * | 226 | * |
227 | * Otherwise, returns a -errno on error | 227 | * Otherwise, returns a -errno on error |
228 | */ | 228 | */ |
229 | static int probe(struct comedi_device * dev, const comedi_devconfig * it); | 229 | static int probe(struct comedi_device * dev, const struct comedi_devconfig * it); |
230 | 230 | ||
231 | /*--------------------------------------------------------------------------- | 231 | /*--------------------------------------------------------------------------- |
232 | FUNCTION DEFINITIONS | 232 | FUNCTION DEFINITIONS |
@@ -238,7 +238,7 @@ static int probe(struct comedi_device * dev, const comedi_devconfig * it); | |||
238 | * in the driver structure, dev->board_ptr contains that | 238 | * in the driver structure, dev->board_ptr contains that |
239 | * address. | 239 | * address. |
240 | */ | 240 | */ |
241 | static int attach(struct comedi_device * dev, comedi_devconfig * it) | 241 | static int attach(struct comedi_device * dev, struct comedi_devconfig * it) |
242 | { | 242 | { |
243 | struct comedi_subdevice *s; | 243 | struct comedi_subdevice *s; |
244 | int err; | 244 | int err; |
@@ -425,7 +425,7 @@ static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
425 | * | 425 | * |
426 | * Otherwise, returns a -errno on error | 426 | * Otherwise, returns a -errno on error |
427 | */ | 427 | */ |
428 | static int probe(struct comedi_device * dev, const comedi_devconfig * it) | 428 | static int probe(struct comedi_device * dev, const struct comedi_devconfig * it) |
429 | { | 429 | { |
430 | struct pci_dev *pcidev; | 430 | struct pci_dev *pcidev; |
431 | int index; | 431 | int index; |
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c index be46f17560d..1ee489864d3 100644 --- a/drivers/staging/comedi/drivers/comedi_bond.c +++ b/drivers/staging/comedi/drivers/comedi_bond.c | |||
@@ -176,10 +176,10 @@ struct Private { | |||
176 | * the board, and also about the kernel module that contains | 176 | * the board, and also about the kernel module that contains |
177 | * the device code. | 177 | * the device code. |
178 | */ | 178 | */ |
179 | static int bonding_attach(struct comedi_device *dev, comedi_devconfig *it); | 179 | static int bonding_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
180 | static int bonding_detach(struct comedi_device *dev); | 180 | static int bonding_detach(struct comedi_device *dev); |
181 | /** Build Private array of all devices.. */ | 181 | /** Build Private array of all devices.. */ |
182 | static int doDevConfig(struct comedi_device *dev, comedi_devconfig *it); | 182 | static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it); |
183 | static void doDevUnconfig(struct comedi_device *dev); | 183 | static void doDevUnconfig(struct comedi_device *dev); |
184 | /* Ugly implementation of realloc that always copies memory around -- I'm lazy, | 184 | /* Ugly implementation of realloc that always copies memory around -- I'm lazy, |
185 | * what can I say? I like to do wasteful memcopies.. :) */ | 185 | * what can I say? I like to do wasteful memcopies.. :) */ |
@@ -224,7 +224,7 @@ static int bonding_dio_insn_config(struct comedi_device *dev, struct comedi_subd | |||
224 | * in the driver structure, dev->board_ptr contains that | 224 | * in the driver structure, dev->board_ptr contains that |
225 | * address. | 225 | * address. |
226 | */ | 226 | */ |
227 | static int bonding_attach(struct comedi_device *dev, comedi_devconfig *it) | 227 | static int bonding_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
228 | { | 228 | { |
229 | struct comedi_subdevice *s; | 229 | struct comedi_subdevice *s; |
230 | 230 | ||
@@ -394,7 +394,7 @@ static void *Realloc(const void *oldmem, size_t newlen, size_t oldlen) | |||
394 | return newmem; | 394 | return newmem; |
395 | } | 395 | } |
396 | 396 | ||
397 | static int doDevConfig(struct comedi_device *dev, comedi_devconfig *it) | 397 | static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it) |
398 | { | 398 | { |
399 | int i; | 399 | int i; |
400 | void *devs_opened[COMEDI_NUM_BOARD_MINORS]; | 400 | void *devs_opened[COMEDI_NUM_BOARD_MINORS]; |
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c index d58ceff063d..a23339155ff 100644 --- a/drivers/staging/comedi/drivers/comedi_parport.c +++ b/drivers/staging/comedi/drivers/comedi_parport.c | |||
@@ -90,7 +90,7 @@ pin, which can be used to wake up tasks. | |||
90 | #define PARPORT_B 1 | 90 | #define PARPORT_B 1 |
91 | #define PARPORT_C 2 | 91 | #define PARPORT_C 2 |
92 | 92 | ||
93 | static int parport_attach(struct comedi_device *dev, comedi_devconfig *it); | 93 | static int parport_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
94 | static int parport_detach(struct comedi_device *dev); | 94 | static int parport_detach(struct comedi_device *dev); |
95 | static struct comedi_driver driver_parport = { | 95 | static struct comedi_driver driver_parport = { |
96 | .driver_name = "comedi_parport", | 96 | .driver_name = "comedi_parport", |
@@ -291,7 +291,7 @@ static irqreturn_t parport_interrupt(int irq, void *d PT_REGS_ARG) | |||
291 | return IRQ_HANDLED; | 291 | return IRQ_HANDLED; |
292 | } | 292 | } |
293 | 293 | ||
294 | static int parport_attach(struct comedi_device *dev, comedi_devconfig *it) | 294 | static int parport_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
295 | { | 295 | { |
296 | int ret; | 296 | int ret; |
297 | unsigned int irq; | 297 | unsigned int irq; |
diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c index 91a865d7ed9..29dd715e3ff 100644 --- a/drivers/staging/comedi/drivers/comedi_rt_timer.c +++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c | |||
@@ -122,7 +122,7 @@ static inline RTIME nano2count(long long ns) | |||
122 | * task period because analog input tends to be slow. */ | 122 | * task period because analog input tends to be slow. */ |
123 | #define SPEED_LIMIT 100000 /* in nanoseconds */ | 123 | #define SPEED_LIMIT 100000 /* in nanoseconds */ |
124 | 124 | ||
125 | static int timer_attach(struct comedi_device * dev, comedi_devconfig * it); | 125 | static int timer_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
126 | static int timer_detach(struct comedi_device * dev); | 126 | static int timer_detach(struct comedi_device * dev); |
127 | static int timer_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 127 | static int timer_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, |
128 | unsigned int trig_num); | 128 | unsigned int trig_num); |
@@ -607,7 +607,7 @@ static int timer_start_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
607 | return 0; | 607 | return 0; |
608 | } | 608 | } |
609 | 609 | ||
610 | static int timer_attach(struct comedi_device * dev, comedi_devconfig * it) | 610 | static int timer_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
611 | { | 611 | { |
612 | int ret; | 612 | int ret; |
613 | struct comedi_subdevice *s, *emul_s; | 613 | struct comedi_subdevice *s, *emul_s; |
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index 09df3d33d22..a31817b1262 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c +++ b/drivers/staging/comedi/drivers/comedi_test.c | |||
@@ -93,7 +93,7 @@ struct waveform_private { | |||
93 | }; | 93 | }; |
94 | #define devpriv ((struct waveform_private *)dev->private) | 94 | #define devpriv ((struct waveform_private *)dev->private) |
95 | 95 | ||
96 | static int waveform_attach(struct comedi_device *dev, comedi_devconfig *it); | 96 | static int waveform_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
97 | static int waveform_detach(struct comedi_device *dev); | 97 | static int waveform_detach(struct comedi_device *dev); |
98 | static struct comedi_driver driver_waveform = { | 98 | static struct comedi_driver driver_waveform = { |
99 | .driver_name = "comedi_test", | 99 | .driver_name = "comedi_test", |
@@ -192,7 +192,7 @@ static void waveform_ai_interrupt(unsigned long arg) | |||
192 | comedi_event(dev, dev->read_subdev); | 192 | comedi_event(dev, dev->read_subdev); |
193 | } | 193 | } |
194 | 194 | ||
195 | static int waveform_attach(struct comedi_device *dev, comedi_devconfig *it) | 195 | static int waveform_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
196 | { | 196 | { |
197 | struct comedi_subdevice *s; | 197 | struct comedi_subdevice *s; |
198 | int amplitude = it->options[0]; | 198 | int amplitude = it->options[0]; |
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index 0e0c790ac74..46e13c6faf4 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c | |||
@@ -75,7 +75,7 @@ typedef struct { | |||
75 | 75 | ||
76 | #define devpriv ((contec_private *)dev->private) | 76 | #define devpriv ((contec_private *)dev->private) |
77 | 77 | ||
78 | static int contec_attach(struct comedi_device * dev, comedi_devconfig * it); | 78 | static int contec_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
79 | static int contec_detach(struct comedi_device * dev); | 79 | static int contec_detach(struct comedi_device * dev); |
80 | static struct comedi_driver driver_contec = { | 80 | static struct comedi_driver driver_contec = { |
81 | driver_name:"contec_pci_dio", | 81 | driver_name:"contec_pci_dio", |
@@ -97,7 +97,7 @@ static int contec_cmdtest(struct comedi_device * dev, struct comedi_subdevice * | |||
97 | static int contec_ns_to_timer(unsigned int *ns, int round); | 97 | static int contec_ns_to_timer(unsigned int *ns, int round); |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | static int contec_attach(struct comedi_device * dev, comedi_devconfig * it) | 100 | static int contec_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
101 | { | 101 | { |
102 | struct pci_dev *pcidev; | 102 | struct pci_dev *pcidev; |
103 | struct comedi_subdevice *s; | 103 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index adda2c4eef1..a2408ebf9c8 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c | |||
@@ -296,7 +296,7 @@ typedef struct daqboard2000_hw { | |||
296 | #define DAQBOARD2000_PosRefDacSelect 0x0100 | 296 | #define DAQBOARD2000_PosRefDacSelect 0x0100 |
297 | #define DAQBOARD2000_NegRefDacSelect 0x0000 | 297 | #define DAQBOARD2000_NegRefDacSelect 0x0000 |
298 | 298 | ||
299 | static int daqboard2000_attach(struct comedi_device * dev, comedi_devconfig * it); | 299 | static int daqboard2000_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
300 | static int daqboard2000_detach(struct comedi_device * dev); | 300 | static int daqboard2000_detach(struct comedi_device * dev); |
301 | 301 | ||
302 | static struct comedi_driver driver_daqboard2000 = { | 302 | static struct comedi_driver driver_daqboard2000 = { |
@@ -717,7 +717,7 @@ static int daqboard2000_8255_cb(int dir, int port, int data, | |||
717 | return result; | 717 | return result; |
718 | } | 718 | } |
719 | 719 | ||
720 | static int daqboard2000_attach(struct comedi_device * dev, comedi_devconfig * it) | 720 | static int daqboard2000_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
721 | { | 721 | { |
722 | int result = 0; | 722 | int result = 0; |
723 | struct comedi_subdevice *s; | 723 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 8943a42badd..e4563331e96 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c | |||
@@ -827,7 +827,7 @@ static int das08_counter_config(struct comedi_device * dev, struct comedi_subdev | |||
827 | return 2; | 827 | return 2; |
828 | } | 828 | } |
829 | 829 | ||
830 | static int das08_attach(struct comedi_device * dev, comedi_devconfig * it); | 830 | static int das08_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
831 | 831 | ||
832 | static struct comedi_driver driver_das08 = { | 832 | static struct comedi_driver driver_das08 = { |
833 | driver_name: DRV_NAME, | 833 | driver_name: DRV_NAME, |
@@ -952,7 +952,7 @@ int das08_common_attach(struct comedi_device * dev, unsigned long iobase) | |||
952 | return 0; | 952 | return 0; |
953 | } | 953 | } |
954 | 954 | ||
955 | static int das08_attach(struct comedi_device * dev, comedi_devconfig * it) | 955 | static int das08_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
956 | { | 956 | { |
957 | int ret; | 957 | int ret; |
958 | unsigned long iobase; | 958 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index 310903a89e4..7079f7c8fa6 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c | |||
@@ -56,7 +56,7 @@ static struct pcmcia_device *cur_dev = NULL; | |||
56 | 56 | ||
57 | #define thisboard ((const struct das08_board_struct *)dev->board_ptr) | 57 | #define thisboard ((const struct das08_board_struct *)dev->board_ptr) |
58 | 58 | ||
59 | static int das08_cs_attach(struct comedi_device * dev, comedi_devconfig * it); | 59 | static int das08_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
60 | 60 | ||
61 | static struct comedi_driver driver_das08_cs = { | 61 | static struct comedi_driver driver_das08_cs = { |
62 | driver_name:"das08_cs", | 62 | driver_name:"das08_cs", |
@@ -69,7 +69,7 @@ static struct comedi_driver driver_das08_cs = { | |||
69 | offset:sizeof(struct das08_board_struct), | 69 | offset:sizeof(struct das08_board_struct), |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static int das08_cs_attach(struct comedi_device * dev, comedi_devconfig * it) | 72 | static int das08_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
73 | { | 73 | { |
74 | int ret; | 74 | int ret; |
75 | unsigned long iobase; | 75 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index c4c12e6b1a7..b959ba8e29f 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c | |||
@@ -698,7 +698,7 @@ static const struct das16_board_struct das16_boards[] = { | |||
698 | 698 | ||
699 | #define n_das16_boards ((sizeof(das16_boards))/(sizeof(das16_board))) | 699 | #define n_das16_boards ((sizeof(das16_boards))/(sizeof(das16_board))) |
700 | 700 | ||
701 | static int das16_attach(struct comedi_device * dev, comedi_devconfig * it); | 701 | static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
702 | static int das16_detach(struct comedi_device * dev); | 702 | static int das16_detach(struct comedi_device * dev); |
703 | static struct comedi_driver driver_das16 = { | 703 | static struct comedi_driver driver_das16 = { |
704 | driver_name:"das16", | 704 | driver_name:"das16", |
@@ -1304,7 +1304,7 @@ static void reg_dump(struct comedi_device * dev) | |||
1304 | inb(dev->iobase + DAS1600_STATUS_B)); | 1304 | inb(dev->iobase + DAS1600_STATUS_B)); |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | static int das16_probe(struct comedi_device * dev, comedi_devconfig * it) | 1307 | static int das16_probe(struct comedi_device * dev, struct comedi_devconfig * it) |
1308 | { | 1308 | { |
1309 | int status; | 1309 | int status; |
1310 | int diobits; | 1310 | int diobits; |
@@ -1366,7 +1366,7 @@ static int das1600_mode_detect(struct comedi_device * dev) | |||
1366 | * 3 Clock speed (in MHz) | 1366 | * 3 Clock speed (in MHz) |
1367 | */ | 1367 | */ |
1368 | 1368 | ||
1369 | static int das16_attach(struct comedi_device * dev, comedi_devconfig * it) | 1369 | static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1370 | { | 1370 | { |
1371 | struct comedi_subdevice *s; | 1371 | struct comedi_subdevice *s; |
1372 | int ret; | 1372 | int ret; |
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c index ea1fd6ec699..039d8e54929 100644 --- a/drivers/staging/comedi/drivers/das16m1.c +++ b/drivers/staging/comedi/drivers/das16m1.c | |||
@@ -166,7 +166,7 @@ static const das16m1_board das16m1_boards[] = { | |||
166 | 166 | ||
167 | #define das16m1_num_boards ((sizeof(das16m1_boards)) / (sizeof(das16m1_boards[0]))) | 167 | #define das16m1_num_boards ((sizeof(das16m1_boards)) / (sizeof(das16m1_boards[0]))) |
168 | 168 | ||
169 | static int das16m1_attach(struct comedi_device * dev, comedi_devconfig * it); | 169 | static int das16m1_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
170 | static int das16m1_detach(struct comedi_device * dev); | 170 | static int das16m1_detach(struct comedi_device * dev); |
171 | static struct comedi_driver driver_das16m1 = { | 171 | static struct comedi_driver driver_das16m1 = { |
172 | driver_name:"das16m1", | 172 | driver_name:"das16m1", |
@@ -635,7 +635,7 @@ static int das16m1_irq_bits(unsigned int irq) | |||
635 | * 1 IRQ | 635 | * 1 IRQ |
636 | */ | 636 | */ |
637 | 637 | ||
638 | static int das16m1_attach(struct comedi_device * dev, comedi_devconfig * it) | 638 | static int das16m1_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
639 | { | 639 | { |
640 | struct comedi_subdevice *s; | 640 | struct comedi_subdevice *s; |
641 | int ret; | 641 | int ret; |
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index cb53e8fe240..06f755a5d32 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c | |||
@@ -180,7 +180,7 @@ enum { | |||
180 | das1802hr, das1802hr_da, das1801hc, das1802hc, das1801ao, das1802ao | 180 | das1802hr, das1802hr_da, das1801hc, das1802hc, das1801ao, das1802ao |
181 | }; | 181 | }; |
182 | 182 | ||
183 | static int das1800_attach(struct comedi_device * dev, comedi_devconfig * it); | 183 | static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
184 | static int das1800_detach(struct comedi_device * dev); | 184 | static int das1800_detach(struct comedi_device * dev); |
185 | static int das1800_probe(struct comedi_device * dev); | 185 | static int das1800_probe(struct comedi_device * dev); |
186 | static int das1800_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 186 | static int das1800_cancel(struct comedi_device * dev, struct comedi_subdevice * s); |
@@ -590,7 +590,7 @@ static int das1800_init_dma(struct comedi_device * dev, unsigned int dma0, | |||
590 | return 0; | 590 | return 0; |
591 | } | 591 | } |
592 | 592 | ||
593 | static int das1800_attach(struct comedi_device * dev, comedi_devconfig * it) | 593 | static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
594 | { | 594 | { |
595 | struct comedi_subdevice *s; | 595 | struct comedi_subdevice *s; |
596 | unsigned long iobase = it->options[0]; | 596 | unsigned long iobase = it->options[0]; |
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c index 628e1116082..37b47267149 100644 --- a/drivers/staging/comedi/drivers/das6402.c +++ b/drivers/staging/comedi/drivers/das6402.c | |||
@@ -98,7 +98,7 @@ This driver has suffered bitrot. | |||
98 | #define C2 0x80 | 98 | #define C2 0x80 |
99 | #define RWLH 0x30 | 99 | #define RWLH 0x30 |
100 | 100 | ||
101 | static int das6402_attach(struct comedi_device * dev, comedi_devconfig * it); | 101 | static int das6402_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
102 | static int das6402_detach(struct comedi_device * dev); | 102 | static int das6402_detach(struct comedi_device * dev); |
103 | static struct comedi_driver driver_das6402 = { | 103 | static struct comedi_driver driver_das6402 = { |
104 | driver_name:"das6402", | 104 | driver_name:"das6402", |
@@ -299,7 +299,7 @@ static int das6402_detach(struct comedi_device * dev) | |||
299 | return 0; | 299 | return 0; |
300 | } | 300 | } |
301 | 301 | ||
302 | static int das6402_attach(struct comedi_device * dev, comedi_devconfig * it) | 302 | static int das6402_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
303 | { | 303 | { |
304 | unsigned int irq; | 304 | unsigned int irq; |
305 | unsigned long iobase; | 305 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index 179a694b074..85407ef8dfb 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c | |||
@@ -242,7 +242,7 @@ typedef struct { | |||
242 | 242 | ||
243 | #define devpriv ((das800_private *)dev->private) | 243 | #define devpriv ((das800_private *)dev->private) |
244 | 244 | ||
245 | static int das800_attach(struct comedi_device * dev, comedi_devconfig * it); | 245 | static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
246 | static int das800_detach(struct comedi_device * dev); | 246 | static int das800_detach(struct comedi_device * dev); |
247 | static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 247 | static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s); |
248 | 248 | ||
@@ -441,7 +441,7 @@ static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG) | |||
441 | return IRQ_HANDLED; | 441 | return IRQ_HANDLED; |
442 | } | 442 | } |
443 | 443 | ||
444 | static int das800_attach(struct comedi_device * dev, comedi_devconfig * it) | 444 | static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
445 | { | 445 | { |
446 | struct comedi_subdevice *s; | 446 | struct comedi_subdevice *s; |
447 | unsigned long iobase = it->options[0]; | 447 | unsigned long iobase = it->options[0]; |
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index 36e283ba753..1b2c58f7eb3 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c | |||
@@ -258,7 +258,7 @@ typedef struct { | |||
258 | * the board, and also about the kernel module that contains | 258 | * the board, and also about the kernel module that contains |
259 | * the device code. | 259 | * the device code. |
260 | */ | 260 | */ |
261 | static int dmm32at_attach(struct comedi_device * dev, comedi_devconfig * it); | 261 | static int dmm32at_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
262 | static int dmm32at_detach(struct comedi_device * dev); | 262 | static int dmm32at_detach(struct comedi_device * dev); |
263 | static struct comedi_driver driver_dmm32at = { | 263 | static struct comedi_driver driver_dmm32at = { |
264 | driver_name:"dmm32at", | 264 | driver_name:"dmm32at", |
@@ -313,7 +313,7 @@ void dmm32at_setaitimer(struct comedi_device * dev, unsigned int nansec); | |||
313 | * in the driver structure, dev->board_ptr contains that | 313 | * in the driver structure, dev->board_ptr contains that |
314 | * address. | 314 | * address. |
315 | */ | 315 | */ |
316 | static int dmm32at_attach(struct comedi_device * dev, comedi_devconfig * it) | 316 | static int dmm32at_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
317 | { | 317 | { |
318 | int ret; | 318 | int ret; |
319 | struct comedi_subdevice *s; | 319 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c index 847aa951d9c..0915d39101b 100644 --- a/drivers/staging/comedi/drivers/dt2801.c +++ b/drivers/staging/comedi/drivers/dt2801.c | |||
@@ -88,7 +88,7 @@ Configuration options: | |||
88 | #define DT2801_STATUS 1 | 88 | #define DT2801_STATUS 1 |
89 | #define DT2801_CMD 1 | 89 | #define DT2801_CMD 1 |
90 | 90 | ||
91 | static int dt2801_attach(struct comedi_device * dev, comedi_devconfig * it); | 91 | static int dt2801_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
92 | static int dt2801_detach(struct comedi_device * dev); | 92 | static int dt2801_detach(struct comedi_device * dev); |
93 | static struct comedi_driver driver_dt2801 = { | 93 | static struct comedi_driver driver_dt2801 = { |
94 | driver_name:"dt2801", | 94 | driver_name:"dt2801", |
@@ -478,7 +478,7 @@ static const struct comedi_lrange *ai_range_lkup(int type, int opt) | |||
478 | [4] - dac0 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] | 478 | [4] - dac0 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] |
479 | [5] - dac1 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] | 479 | [5] - dac1 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] |
480 | */ | 480 | */ |
481 | static int dt2801_attach(struct comedi_device * dev, comedi_devconfig * it) | 481 | static int dt2801_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
482 | { | 482 | { |
483 | struct comedi_subdevice *s; | 483 | struct comedi_subdevice *s; |
484 | unsigned long iobase; | 484 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c index 165ea6f22ba..722e3f54e46 100644 --- a/drivers/staging/comedi/drivers/dt2811.c +++ b/drivers/staging/comedi/drivers/dt2811.c | |||
@@ -212,7 +212,7 @@ static const boardtype boardtypes[] = { | |||
212 | 212 | ||
213 | #define this_board ((const boardtype *)dev->board_ptr) | 213 | #define this_board ((const boardtype *)dev->board_ptr) |
214 | 214 | ||
215 | static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it); | 215 | static int dt2811_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
216 | static int dt2811_detach(struct comedi_device * dev); | 216 | static int dt2811_detach(struct comedi_device * dev); |
217 | static struct comedi_driver driver_dt2811 = { | 217 | static struct comedi_driver driver_dt2811 = { |
218 | driver_name:"dt2811", | 218 | driver_name:"dt2811", |
@@ -308,7 +308,7 @@ static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG) | |||
308 | 2 == unipolar 5V (0V -- +5V) | 308 | 2 == unipolar 5V (0V -- +5V) |
309 | */ | 309 | */ |
310 | 310 | ||
311 | static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it) | 311 | static int dt2811_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
312 | { | 312 | { |
313 | //int i, irq; | 313 | //int i, irq; |
314 | //unsigned long irqs; | 314 | //unsigned long irqs; |
diff --git a/drivers/staging/comedi/drivers/dt2814.c b/drivers/staging/comedi/drivers/dt2814.c index f97fed0552a..660079acd22 100644 --- a/drivers/staging/comedi/drivers/dt2814.c +++ b/drivers/staging/comedi/drivers/dt2814.c | |||
@@ -59,7 +59,7 @@ addition, the clock does not seem to be very accurate. | |||
59 | #define DT2814_ENB 0x10 | 59 | #define DT2814_ENB 0x10 |
60 | #define DT2814_CHANMASK 0x0f | 60 | #define DT2814_CHANMASK 0x0f |
61 | 61 | ||
62 | static int dt2814_attach(struct comedi_device * dev, comedi_devconfig * it); | 62 | static int dt2814_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
63 | static int dt2814_detach(struct comedi_device * dev); | 63 | static int dt2814_detach(struct comedi_device * dev); |
64 | static struct comedi_driver driver_dt2814 = { | 64 | static struct comedi_driver driver_dt2814 = { |
65 | driver_name:"dt2814", | 65 | driver_name:"dt2814", |
@@ -243,7 +243,7 @@ static int dt2814_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
243 | 243 | ||
244 | } | 244 | } |
245 | 245 | ||
246 | static int dt2814_attach(struct comedi_device * dev, comedi_devconfig * it) | 246 | static int dt2814_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
247 | { | 247 | { |
248 | int i, irq; | 248 | int i, irq; |
249 | int ret; | 249 | int ret; |
diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c index f9b79d2867e..553842e120f 100644 --- a/drivers/staging/comedi/drivers/dt2815.c +++ b/drivers/staging/comedi/drivers/dt2815.c | |||
@@ -75,7 +75,7 @@ static const struct comedi_lrange range_dt2815_ao_20_current = { 1, { | |||
75 | #define DT2815_DATA 0 | 75 | #define DT2815_DATA 0 |
76 | #define DT2815_STATUS 1 | 76 | #define DT2815_STATUS 1 |
77 | 77 | ||
78 | static int dt2815_attach(struct comedi_device * dev, comedi_devconfig * it); | 78 | static int dt2815_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
79 | static int dt2815_detach(struct comedi_device * dev); | 79 | static int dt2815_detach(struct comedi_device * dev); |
80 | static struct comedi_driver driver_dt2815 = { | 80 | static struct comedi_driver driver_dt2815 = { |
81 | driver_name:"dt2815", | 81 | driver_name:"dt2815", |
@@ -177,7 +177,7 @@ static int dt2815_ao_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
177 | 1 == current | 177 | 1 == current |
178 | */ | 178 | */ |
179 | 179 | ||
180 | static int dt2815_attach(struct comedi_device * dev, comedi_devconfig * it) | 180 | static int dt2815_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
181 | { | 181 | { |
182 | struct comedi_subdevice *s; | 182 | struct comedi_subdevice *s; |
183 | int i; | 183 | int i; |
diff --git a/drivers/staging/comedi/drivers/dt2817.c b/drivers/staging/comedi/drivers/dt2817.c index 59376ac6c25..2dc396a44e6 100644 --- a/drivers/staging/comedi/drivers/dt2817.c +++ b/drivers/staging/comedi/drivers/dt2817.c | |||
@@ -47,7 +47,7 @@ Configuration options: | |||
47 | #define DT2817_CR 0 | 47 | #define DT2817_CR 0 |
48 | #define DT2817_DATA 1 | 48 | #define DT2817_DATA 1 |
49 | 49 | ||
50 | static int dt2817_attach(struct comedi_device * dev, comedi_devconfig * it); | 50 | static int dt2817_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
51 | static int dt2817_detach(struct comedi_device * dev); | 51 | static int dt2817_detach(struct comedi_device * dev); |
52 | static struct comedi_driver driver_dt2817 = { | 52 | static struct comedi_driver driver_dt2817 = { |
53 | driver_name:"dt2817", | 53 | driver_name:"dt2817", |
@@ -131,7 +131,7 @@ static int dt2817_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
131 | return 2; | 131 | return 2; |
132 | } | 132 | } |
133 | 133 | ||
134 | static int dt2817_attach(struct comedi_device * dev, comedi_devconfig * it) | 134 | static int dt2817_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
135 | { | 135 | { |
136 | int ret; | 136 | int ret; |
137 | struct comedi_subdevice *s; | 137 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 1a74f31ad3f..1cc0e3b17bb 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c | |||
@@ -394,7 +394,7 @@ typedef struct { | |||
394 | if(_i){b} \ | 394 | if(_i){b} \ |
395 | }while(0) | 395 | }while(0) |
396 | 396 | ||
397 | static int dt282x_attach(struct comedi_device * dev, comedi_devconfig * it); | 397 | static int dt282x_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
398 | static int dt282x_detach(struct comedi_device * dev); | 398 | static int dt282x_detach(struct comedi_device * dev); |
399 | static struct comedi_driver driver_dt282x = { | 399 | static struct comedi_driver driver_dt282x = { |
400 | driver_name:"dt282x", | 400 | driver_name:"dt282x", |
@@ -1240,7 +1240,7 @@ enum { opt_iobase = 0, opt_irq, opt_dma1, opt_dma2, /* i/o base, irq, dma channe | |||
1240 | 9 ao0 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V | 1240 | 9 ao0 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V |
1241 | 10 ao1 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V | 1241 | 10 ao1 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V |
1242 | */ | 1242 | */ |
1243 | static int dt282x_attach(struct comedi_device * dev, comedi_devconfig * it) | 1243 | static int dt282x_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1244 | { | 1244 | { |
1245 | int i, irq; | 1245 | int i, irq; |
1246 | int ret; | 1246 | int ret; |
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index 4b140f21cbd..a8367d9c0a4 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c | |||
@@ -271,7 +271,7 @@ typedef struct { | |||
271 | } dt3k_private; | 271 | } dt3k_private; |
272 | #define devpriv ((dt3k_private *)dev->private) | 272 | #define devpriv ((dt3k_private *)dev->private) |
273 | 273 | ||
274 | static int dt3000_attach(struct comedi_device * dev, comedi_devconfig * it); | 274 | static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
275 | static int dt3000_detach(struct comedi_device * dev); | 275 | static int dt3000_detach(struct comedi_device * dev); |
276 | static struct comedi_driver driver_dt3000 = { | 276 | static struct comedi_driver driver_dt3000 = { |
277 | driver_name:"dt3000", | 277 | driver_name:"dt3000", |
@@ -797,7 +797,7 @@ static int dt3k_mem_insn_read(struct comedi_device * dev, struct comedi_subdevic | |||
797 | 797 | ||
798 | static int dt_pci_probe(struct comedi_device * dev, int bus, int slot); | 798 | static int dt_pci_probe(struct comedi_device * dev, int bus, int slot); |
799 | 799 | ||
800 | static int dt3000_attach(struct comedi_device * dev, comedi_devconfig * it) | 800 | static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
801 | { | 801 | { |
802 | struct comedi_subdevice *s; | 802 | struct comedi_subdevice *s; |
803 | int bus, slot; | 803 | int bus, slot; |
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c index e2131fd4f45..cc4c0463008 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c | |||
@@ -1009,7 +1009,7 @@ static int dt9812_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s | |||
1009 | return n; | 1009 | return n; |
1010 | } | 1010 | } |
1011 | 1011 | ||
1012 | static int dt9812_attach(struct comedi_device *dev, comedi_devconfig *it) | 1012 | static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1013 | { | 1013 | { |
1014 | int i; | 1014 | int i; |
1015 | struct comedi_subdevice *s; | 1015 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c index cd6b3e03751..6fe747d8dd1 100644 --- a/drivers/staging/comedi/drivers/fl512.c +++ b/drivers/staging/comedi/drivers/fl512.c | |||
@@ -40,7 +40,7 @@ static const struct comedi_lrange range_fl512 = { 4, { | |||
40 | } | 40 | } |
41 | }; | 41 | }; |
42 | 42 | ||
43 | static int fl512_attach(struct comedi_device * dev, comedi_devconfig * it); | 43 | static int fl512_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
44 | static int fl512_detach(struct comedi_device * dev); | 44 | static int fl512_detach(struct comedi_device * dev); |
45 | 45 | ||
46 | static struct comedi_driver driver_fl512 = { | 46 | static struct comedi_driver driver_fl512 = { |
@@ -124,7 +124,7 @@ static int fl512_ao_insn_readback(struct comedi_device * dev, | |||
124 | /* | 124 | /* |
125 | * start attach | 125 | * start attach |
126 | */ | 126 | */ |
127 | static int fl512_attach(struct comedi_device * dev, comedi_devconfig * it) | 127 | static int fl512_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
128 | { | 128 | { |
129 | unsigned long iobase; | 129 | unsigned long iobase; |
130 | struct comedi_subdevice *s; /* pointer to the subdevice: | 130 | struct comedi_subdevice *s; /* pointer to the subdevice: |
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index 5227e3ee273..535aadb98dc 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c | |||
@@ -52,7 +52,7 @@ support could be added to this driver. | |||
52 | #include "plx9080.h" | 52 | #include "plx9080.h" |
53 | #include "comedi_fc.h" | 53 | #include "comedi_fc.h" |
54 | 54 | ||
55 | static int hpdi_attach(struct comedi_device * dev, comedi_devconfig * it); | 55 | static int hpdi_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
56 | static int hpdi_detach(struct comedi_device * dev); | 56 | static int hpdi_detach(struct comedi_device * dev); |
57 | void abort_dma(struct comedi_device * dev, unsigned int channel); | 57 | void abort_dma(struct comedi_device * dev, unsigned int channel); |
58 | static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s); | 58 | static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s); |
@@ -552,7 +552,7 @@ static int setup_dma_descriptors(struct comedi_device * dev, | |||
552 | return transfer_size; | 552 | return transfer_size; |
553 | } | 553 | } |
554 | 554 | ||
555 | static int hpdi_attach(struct comedi_device * dev, comedi_devconfig * it) | 555 | static int hpdi_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
556 | { | 556 | { |
557 | struct pci_dev *pcidev; | 557 | struct pci_dev *pcidev; |
558 | int i; | 558 | int i; |
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 5463718e5ff..15fce0190b2 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c | |||
@@ -123,7 +123,7 @@ static const char range_codes_analog[] = { 0x00, 0x20, 0x10, 0x30 }; | |||
123 | Forward declarations | 123 | Forward declarations |
124 | ============================================================================== | 124 | ============================================================================== |
125 | */ | 125 | */ |
126 | static int icp_multi_attach(struct comedi_device *dev, comedi_devconfig *it); | 126 | static int icp_multi_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
127 | static int icp_multi_detach(struct comedi_device *dev); | 127 | static int icp_multi_detach(struct comedi_device *dev); |
128 | 128 | ||
129 | /* | 129 | /* |
@@ -864,13 +864,13 @@ static int icp_multi_reset(struct comedi_device *dev) | |||
864 | 864 | ||
865 | Parameters: | 865 | Parameters: |
866 | struct comedi_device *dev Pointer to current device structure | 866 | struct comedi_device *dev Pointer to current device structure |
867 | comedi_devconfig *it Pointer to current device configuration | 867 | struct comedi_devconfig *it Pointer to current device configuration |
868 | 868 | ||
869 | Returns:int 0 = success | 869 | Returns:int 0 = success |
870 | 870 | ||
871 | ============================================================================== | 871 | ============================================================================== |
872 | */ | 872 | */ |
873 | static int icp_multi_attach(struct comedi_device *dev, comedi_devconfig *it) | 873 | static int icp_multi_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
874 | { | 874 | { |
875 | struct comedi_subdevice *s; | 875 | struct comedi_subdevice *s; |
876 | int ret, subdev, n_subdevices; | 876 | int ret, subdev, n_subdevices; |
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c index 5f513bac8e4..a31f0d20fcf 100644 --- a/drivers/staging/comedi/drivers/ii_pci20kc.c +++ b/drivers/staging/comedi/drivers/ii_pci20kc.c | |||
@@ -156,7 +156,7 @@ typedef struct { | |||
156 | #define devpriv ((pci20xxx_private *)dev->private) | 156 | #define devpriv ((pci20xxx_private *)dev->private) |
157 | #define CHAN (CR_CHAN(it->chanlist[0])) | 157 | #define CHAN (CR_CHAN(it->chanlist[0])) |
158 | 158 | ||
159 | static int pci20xxx_attach(struct comedi_device * dev, comedi_devconfig * it); | 159 | static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
160 | static int pci20xxx_detach(struct comedi_device * dev); | 160 | static int pci20xxx_detach(struct comedi_device * dev); |
161 | 161 | ||
162 | static struct comedi_driver driver_pci20xxx = { | 162 | static struct comedi_driver driver_pci20xxx = { |
@@ -199,7 +199,7 @@ static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice | |||
199 | 1 == unipolar 10V (0V -- +10V) | 199 | 1 == unipolar 10V (0V -- +10V) |
200 | 2 == bipolar 5V (-5V -- +5V) | 200 | 2 == bipolar 5V (-5V -- +5V) |
201 | */ | 201 | */ |
202 | static int pci20xxx_attach(struct comedi_device * dev, comedi_devconfig * it) | 202 | static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
203 | { | 203 | { |
204 | unsigned char i; | 204 | unsigned char i; |
205 | int ret; | 205 | int ret; |
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 19371c6048d..8f481b54564 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c | |||
@@ -103,7 +103,7 @@ static int comedi_load_firmware(struct comedi_device * dev, | |||
103 | #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 | 103 | #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 |
104 | #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 | 104 | #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 |
105 | 105 | ||
106 | static int jr3_pci_attach(struct comedi_device * dev, comedi_devconfig * it); | 106 | static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
107 | static int jr3_pci_detach(struct comedi_device * dev); | 107 | static int jr3_pci_detach(struct comedi_device * dev); |
108 | 108 | ||
109 | static struct comedi_driver driver_jr3_pci = { | 109 | static struct comedi_driver driver_jr3_pci = { |
@@ -770,7 +770,7 @@ static void jr3_pci_poll_dev(unsigned long data) | |||
770 | add_timer(&devpriv->timer); | 770 | add_timer(&devpriv->timer); |
771 | } | 771 | } |
772 | 772 | ||
773 | static int jr3_pci_attach(struct comedi_device * dev, comedi_devconfig * it) | 773 | static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
774 | { | 774 | { |
775 | int result = 0; | 775 | int result = 0; |
776 | struct pci_dev *card = NULL; | 776 | struct pci_dev *card = NULL; |
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index f3b4f74e873..105a9cfeb74 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c | |||
@@ -48,7 +48,7 @@ Kolter Electronic PCI Counter Card. | |||
48 | 48 | ||
49 | /*-- function prototypes ----------------------------------------------------*/ | 49 | /*-- function prototypes ----------------------------------------------------*/ |
50 | 50 | ||
51 | static int cnt_attach(struct comedi_device * dev, comedi_devconfig * it); | 51 | static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
52 | static int cnt_detach(struct comedi_device * dev); | 52 | static int cnt_detach(struct comedi_device * dev); |
53 | 53 | ||
54 | static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = { | 54 | static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = { |
@@ -144,7 +144,7 @@ static int cnt_rinsn(struct comedi_device * dev, | |||
144 | 144 | ||
145 | /*-- attach -----------------------------------------------------------------*/ | 145 | /*-- attach -----------------------------------------------------------------*/ |
146 | 146 | ||
147 | static int cnt_attach(struct comedi_device * dev, comedi_devconfig * it) | 147 | static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
148 | { | 148 | { |
149 | struct comedi_subdevice *subdevice; | 149 | struct comedi_subdevice *subdevice; |
150 | struct pci_dev *pci_device; | 150 | struct pci_dev *pci_device; |
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 70c3cc2c307..d0a17a1adfc 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c | |||
@@ -118,7 +118,7 @@ static const me4000_board_t me4000_boards[] = { | |||
118 | /*----------------------------------------------------------------------------- | 118 | /*----------------------------------------------------------------------------- |
119 | Comedi function prototypes | 119 | Comedi function prototypes |
120 | ---------------------------------------------------------------------------*/ | 120 | ---------------------------------------------------------------------------*/ |
121 | static int me4000_attach(struct comedi_device *dev, comedi_devconfig *it); | 121 | static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
122 | static int me4000_detach(struct comedi_device *dev); | 122 | static int me4000_detach(struct comedi_device *dev); |
123 | static struct comedi_driver driver_me4000 = { | 123 | static struct comedi_driver driver_me4000 = { |
124 | driver_name:"me4000", | 124 | driver_name:"me4000", |
@@ -130,7 +130,7 @@ static struct comedi_driver driver_me4000 = { | |||
130 | /*----------------------------------------------------------------------------- | 130 | /*----------------------------------------------------------------------------- |
131 | Meilhaus function prototypes | 131 | Meilhaus function prototypes |
132 | ---------------------------------------------------------------------------*/ | 132 | ---------------------------------------------------------------------------*/ |
133 | static int me4000_probe(struct comedi_device *dev, comedi_devconfig *it); | 133 | static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it); |
134 | static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p); | 134 | static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p); |
135 | static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p); | 135 | static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p); |
136 | static int init_ao_context(struct comedi_device *dev); | 136 | static int init_ao_context(struct comedi_device *dev); |
@@ -247,7 +247,7 @@ static const struct comedi_lrange me4000_ao_range = { | |||
247 | } | 247 | } |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static int me4000_attach(struct comedi_device *dev, comedi_devconfig *it) | 250 | static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
251 | { | 251 | { |
252 | struct comedi_subdevice *s; | 252 | struct comedi_subdevice *s; |
253 | int result; | 253 | int result; |
@@ -369,7 +369,7 @@ static int me4000_attach(struct comedi_device *dev, comedi_devconfig *it) | |||
369 | return 0; | 369 | return 0; |
370 | } | 370 | } |
371 | 371 | ||
372 | static int me4000_probe(struct comedi_device *dev, comedi_devconfig *it) | 372 | static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) |
373 | { | 373 | { |
374 | struct pci_dev *pci_device; | 374 | struct pci_dev *pci_device; |
375 | int result, i; | 375 | int result, i; |
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 901e1d13fcf..0f023d009e6 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c | |||
@@ -144,7 +144,7 @@ from http://www.comedi.org | |||
144 | #define ME_COUNTER_VALUE_B 0x0022 /* R | - */ | 144 | #define ME_COUNTER_VALUE_B 0x0022 /* R | - */ |
145 | 145 | ||
146 | /* Function prototypes */ | 146 | /* Function prototypes */ |
147 | static int me_attach(struct comedi_device *dev, comedi_devconfig *it); | 147 | static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
148 | static int me_detach(struct comedi_device *dev); | 148 | static int me_detach(struct comedi_device *dev); |
149 | 149 | ||
150 | static const struct comedi_lrange me2000_ai_range = { | 150 | static const struct comedi_lrange me2000_ai_range = { |
@@ -632,7 +632,7 @@ static int me_reset(struct comedi_device *dev) | |||
632 | * - Register PCI device | 632 | * - Register PCI device |
633 | * - Declare device driver capability | 633 | * - Declare device driver capability |
634 | */ | 634 | */ |
635 | static int me_attach(struct comedi_device *dev, comedi_devconfig *it) | 635 | static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
636 | { | 636 | { |
637 | struct pci_dev *pci_device; | 637 | struct pci_dev *pci_device; |
638 | struct comedi_subdevice *subdevice; | 638 | struct comedi_subdevice *subdevice; |
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c index 59e8ecd6608..ee053f149dd 100644 --- a/drivers/staging/comedi/drivers/mpc624.c +++ b/drivers/staging/comedi/drivers/mpc624.c | |||
@@ -144,7 +144,7 @@ static const struct comedi_lrange range_mpc624_bipolar10 = { | |||
144 | }; | 144 | }; |
145 | 145 | ||
146 | //---------------------------------------------------------------------------- | 146 | //---------------------------------------------------------------------------- |
147 | static int mpc624_attach(struct comedi_device * dev, comedi_devconfig * it); | 147 | static int mpc624_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
148 | static int mpc624_detach(struct comedi_device * dev); | 148 | static int mpc624_detach(struct comedi_device * dev); |
149 | //---------------------------------------------------------------------------- | 149 | //---------------------------------------------------------------------------- |
150 | static struct comedi_driver driver_mpc624 = { | 150 | static struct comedi_driver driver_mpc624 = { |
@@ -158,7 +158,7 @@ static struct comedi_driver driver_mpc624 = { | |||
158 | static int mpc624_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 158 | static int mpc624_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, |
159 | struct comedi_insn * insn, unsigned int * data); | 159 | struct comedi_insn * insn, unsigned int * data); |
160 | //---------------------------------------------------------------------------- | 160 | //---------------------------------------------------------------------------- |
161 | static int mpc624_attach(struct comedi_device * dev, comedi_devconfig * it) | 161 | static int mpc624_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
162 | { | 162 | { |
163 | struct comedi_subdevice *s; | 163 | struct comedi_subdevice *s; |
164 | unsigned long iobase; | 164 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/mpc8260cpm.c b/drivers/staging/comedi/drivers/mpc8260cpm.c index 645c4705324..7250865e8d6 100644 --- a/drivers/staging/comedi/drivers/mpc8260cpm.c +++ b/drivers/staging/comedi/drivers/mpc8260cpm.c | |||
@@ -44,7 +44,7 @@ typedef struct { | |||
44 | } mpc8260cpm_private; | 44 | } mpc8260cpm_private; |
45 | #define devpriv ((mpc8260cpm_private *)dev->private) | 45 | #define devpriv ((mpc8260cpm_private *)dev->private) |
46 | 46 | ||
47 | static int mpc8260cpm_attach(struct comedi_device * dev, comedi_devconfig * it); | 47 | static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
48 | static int mpc8260cpm_detach(struct comedi_device * dev); | 48 | static int mpc8260cpm_detach(struct comedi_device * dev); |
49 | static struct comedi_driver driver_mpc8260cpm = { | 49 | static struct comedi_driver driver_mpc8260cpm = { |
50 | driver_name:"mpc8260cpm", | 50 | driver_name:"mpc8260cpm", |
@@ -60,7 +60,7 @@ static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subde | |||
60 | static int mpc8260cpm_dio_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 60 | static int mpc8260cpm_dio_bits(struct comedi_device * dev, struct comedi_subdevice * s, |
61 | struct comedi_insn * insn, unsigned int * data); | 61 | struct comedi_insn * insn, unsigned int * data); |
62 | 62 | ||
63 | static int mpc8260cpm_attach(struct comedi_device * dev, comedi_devconfig * it) | 63 | static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
64 | { | 64 | { |
65 | struct comedi_subdevice *s; | 65 | struct comedi_subdevice *s; |
66 | int i; | 66 | int i; |
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c index 1ff60fa5384..9e47574171d 100644 --- a/drivers/staging/comedi/drivers/multiq3.c +++ b/drivers/staging/comedi/drivers/multiq3.c | |||
@@ -82,7 +82,7 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3) | |||
82 | 82 | ||
83 | #define MULTIQ3_TIMEOUT 30 | 83 | #define MULTIQ3_TIMEOUT 30 |
84 | 84 | ||
85 | static int multiq3_attach(struct comedi_device * dev, comedi_devconfig * it); | 85 | static int multiq3_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
86 | static int multiq3_detach(struct comedi_device * dev); | 86 | static int multiq3_detach(struct comedi_device * dev); |
87 | static struct comedi_driver driver_multiq3 = { | 87 | static struct comedi_driver driver_multiq3 = { |
88 | driver_name:"multiq3", | 88 | driver_name:"multiq3", |
@@ -235,7 +235,7 @@ static void encoder_reset(struct comedi_device * dev) | |||
235 | options[2] - number of encoder chips installed | 235 | options[2] - number of encoder chips installed |
236 | */ | 236 | */ |
237 | 237 | ||
238 | static int multiq3_attach(struct comedi_device * dev, comedi_devconfig * it) | 238 | static int multiq3_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
239 | { | 239 | { |
240 | int result = 0; | 240 | int result = 0; |
241 | unsigned long iobase; | 241 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index 52c35c4f0c0..18fb7995c7c 100644 --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c | |||
@@ -75,7 +75,7 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800 | |||
75 | #define Rising_Edge_Detection_Enable(x) (0x018+(x)) | 75 | #define Rising_Edge_Detection_Enable(x) (0x018+(x)) |
76 | #define Falling_Edge_Detection_Enable(x) (0x020+(x)) | 76 | #define Falling_Edge_Detection_Enable(x) (0x020+(x)) |
77 | 77 | ||
78 | static int ni6527_attach(struct comedi_device * dev, comedi_devconfig * it); | 78 | static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
79 | static int ni6527_detach(struct comedi_device * dev); | 79 | static int ni6527_detach(struct comedi_device * dev); |
80 | static struct comedi_driver driver_ni6527 = { | 80 | static struct comedi_driver driver_ni6527 = { |
81 | driver_name:"ni6527", | 81 | driver_name:"ni6527", |
@@ -361,7 +361,7 @@ static int ni6527_intr_insn_config(struct comedi_device * dev, struct comedi_sub | |||
361 | return 2; | 361 | return 2; |
362 | } | 362 | } |
363 | 363 | ||
364 | static int ni6527_attach(struct comedi_device * dev, comedi_devconfig * it) | 364 | static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
365 | { | 365 | { |
366 | struct comedi_subdevice *s; | 366 | struct comedi_subdevice *s; |
367 | int ret; | 367 | int ret; |
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index 7b439972290..59edcdf8e03 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c | |||
@@ -102,7 +102,7 @@ static inline unsigned Filter_Enable(unsigned port) | |||
102 | #define OverflowIntEnable 0x02 | 102 | #define OverflowIntEnable 0x02 |
103 | #define EdgeIntEnable 0x01 | 103 | #define EdgeIntEnable 0x01 |
104 | 104 | ||
105 | static int ni_65xx_attach(struct comedi_device * dev, comedi_devconfig * it); | 105 | static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
106 | static int ni_65xx_detach(struct comedi_device * dev); | 106 | static int ni_65xx_detach(struct comedi_device * dev); |
107 | static struct comedi_driver driver_ni_65xx = { | 107 | static struct comedi_driver driver_ni_65xx = { |
108 | driver_name:"ni_65xx", | 108 | driver_name:"ni_65xx", |
@@ -615,7 +615,7 @@ static int ni_65xx_intr_insn_config(struct comedi_device * dev, struct comedi_su | |||
615 | return 2; | 615 | return 2; |
616 | } | 616 | } |
617 | 617 | ||
618 | static int ni_65xx_attach(struct comedi_device * dev, comedi_devconfig * it) | 618 | static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
619 | { | 619 | { |
620 | struct comedi_subdevice *s; | 620 | struct comedi_subdevice *s; |
621 | unsigned i; | 621 | unsigned i; |
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 7760df60435..0af2049feb9 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c | |||
@@ -444,7 +444,7 @@ static inline const ni_660x_board *board(struct comedi_device * dev) | |||
444 | 444 | ||
445 | #define n_ni_660x_boards (sizeof(ni_660x_boards)/sizeof(ni_660x_boards[0])) | 445 | #define n_ni_660x_boards (sizeof(ni_660x_boards)/sizeof(ni_660x_boards[0])) |
446 | 446 | ||
447 | static int ni_660x_attach(struct comedi_device * dev, comedi_devconfig * it); | 447 | static int ni_660x_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
448 | static int ni_660x_detach(struct comedi_device * dev); | 448 | static int ni_660x_detach(struct comedi_device * dev); |
449 | static void init_tio_chip(struct comedi_device * dev, int chipset); | 449 | static void init_tio_chip(struct comedi_device * dev, int chipset); |
450 | static void ni_660x_select_pfi_output(struct comedi_device * dev, unsigned pfi_channel, | 450 | static void ni_660x_select_pfi_output(struct comedi_device * dev, unsigned pfi_channel, |
@@ -980,7 +980,7 @@ static void ni_660x_free_mite_rings(struct comedi_device * dev) | |||
980 | } | 980 | } |
981 | } | 981 | } |
982 | 982 | ||
983 | static int ni_660x_attach(struct comedi_device * dev, comedi_devconfig * it) | 983 | static int ni_660x_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
984 | { | 984 | { |
985 | struct comedi_subdevice *s; | 985 | struct comedi_subdevice *s; |
986 | int ret; | 986 | int ret; |
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 7c07ebbd2f0..28b3355f5b0 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c | |||
@@ -108,7 +108,7 @@ typedef struct { | |||
108 | #define devpriv ((ni_670x_private *)dev->private) | 108 | #define devpriv ((ni_670x_private *)dev->private) |
109 | #define n_ni_670x_boards (sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0])) | 109 | #define n_ni_670x_boards (sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0])) |
110 | 110 | ||
111 | static int ni_670x_attach(struct comedi_device * dev, comedi_devconfig * it); | 111 | static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
112 | static int ni_670x_detach(struct comedi_device * dev); | 112 | static int ni_670x_detach(struct comedi_device * dev); |
113 | 113 | ||
114 | static struct comedi_driver driver_ni_670x = { | 114 | static struct comedi_driver driver_ni_670x = { |
@@ -133,7 +133,7 @@ static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
133 | static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 133 | static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, |
134 | struct comedi_insn * insn, unsigned int * data); | 134 | struct comedi_insn * insn, unsigned int * data); |
135 | 135 | ||
136 | static int ni_670x_attach(struct comedi_device * dev, comedi_devconfig * it) | 136 | static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
137 | { | 137 | { |
138 | struct comedi_subdevice *s; | 138 | struct comedi_subdevice *s; |
139 | int ret; | 139 | int ret; |
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index 6f2f8d35dc1..d1422782681 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c | |||
@@ -167,7 +167,7 @@ typedef struct { | |||
167 | 167 | ||
168 | #define devpriv ((a2150_private *)dev->private) | 168 | #define devpriv ((a2150_private *)dev->private) |
169 | 169 | ||
170 | static int a2150_attach(struct comedi_device * dev, comedi_devconfig * it); | 170 | static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
171 | static int a2150_detach(struct comedi_device * dev); | 171 | static int a2150_detach(struct comedi_device * dev); |
172 | static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 172 | static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s); |
173 | 173 | ||
@@ -322,7 +322,7 @@ static int a2150_probe(struct comedi_device * dev) | |||
322 | return ID_BITS(status); | 322 | return ID_BITS(status); |
323 | } | 323 | } |
324 | 324 | ||
325 | static int a2150_attach(struct comedi_device * dev, comedi_devconfig * it) | 325 | static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
326 | { | 326 | { |
327 | struct comedi_subdevice *s; | 327 | struct comedi_subdevice *s; |
328 | unsigned long iobase = it->options[0]; | 328 | unsigned long iobase = it->options[0]; |
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index c42d89d41e7..f8c950d52ab 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c | |||
@@ -178,7 +178,7 @@ typedef struct { | |||
178 | } atao_private; | 178 | } atao_private; |
179 | #define devpriv ((atao_private *)dev->private) | 179 | #define devpriv ((atao_private *)dev->private) |
180 | 180 | ||
181 | static int atao_attach(struct comedi_device * dev, comedi_devconfig * it); | 181 | static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
182 | static int atao_detach(struct comedi_device * dev); | 182 | static int atao_detach(struct comedi_device * dev); |
183 | static struct comedi_driver driver_atao = { | 183 | static struct comedi_driver driver_atao = { |
184 | driver_name:"ni_at_ao", | 184 | driver_name:"ni_at_ao", |
@@ -207,7 +207,7 @@ static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdev | |||
207 | static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 207 | static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, |
208 | struct comedi_insn * insn, unsigned int * data); | 208 | struct comedi_insn * insn, unsigned int * data); |
209 | 209 | ||
210 | static int atao_attach(struct comedi_device * dev, comedi_devconfig * it) | 210 | static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
211 | { | 211 | { |
212 | struct comedi_subdevice *s; | 212 | struct comedi_subdevice *s; |
213 | unsigned long iobase; | 213 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index d5baaa1ca3f..fcc38535afc 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c | |||
@@ -338,7 +338,7 @@ static struct pnp_device_id device_ids[] = { | |||
338 | 338 | ||
339 | MODULE_DEVICE_TABLE(pnp, device_ids); | 339 | MODULE_DEVICE_TABLE(pnp, device_ids); |
340 | 340 | ||
341 | static int ni_atmio_attach(struct comedi_device * dev, comedi_devconfig * it); | 341 | static int ni_atmio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
342 | static int ni_atmio_detach(struct comedi_device * dev); | 342 | static int ni_atmio_detach(struct comedi_device * dev); |
343 | static struct comedi_driver driver_atmio = { | 343 | static struct comedi_driver driver_atmio = { |
344 | driver_name:"ni_atmio", | 344 | driver_name:"ni_atmio", |
@@ -404,7 +404,7 @@ static int ni_isapnp_find_board(struct pnp_dev **dev) | |||
404 | return 0; | 404 | return 0; |
405 | } | 405 | } |
406 | 406 | ||
407 | static int ni_atmio_attach(struct comedi_device * dev, comedi_devconfig * it) | 407 | static int ni_atmio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
408 | { | 408 | { |
409 | struct pnp_dev *isapnp_dev; | 409 | struct pnp_dev *isapnp_dev; |
410 | int ret; | 410 | int ret; |
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c index 4d3cb5fa48b..5edaa67fd40 100644 --- a/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c | |||
@@ -123,7 +123,7 @@ static const atmio16_board_t atmio16_boards[] = { | |||
123 | #define boardtype ((const atmio16_board_t *)dev->board_ptr) | 123 | #define boardtype ((const atmio16_board_t *)dev->board_ptr) |
124 | 124 | ||
125 | /* function prototypes */ | 125 | /* function prototypes */ |
126 | static int atmio16d_attach(struct comedi_device * dev, comedi_devconfig * it); | 126 | static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
127 | static int atmio16d_detach(struct comedi_device * dev); | 127 | static int atmio16d_detach(struct comedi_device * dev); |
128 | static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG); | 128 | static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG); |
129 | static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 129 | static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, |
@@ -704,7 +704,7 @@ static int atmio16d_dio_insn_config(struct comedi_device * dev, struct comedi_su | |||
704 | options[12] - dac1 coding | 704 | options[12] - dac1 coding |
705 | */ | 705 | */ |
706 | 706 | ||
707 | static int atmio16d_attach(struct comedi_device * dev, comedi_devconfig * it) | 707 | static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
708 | { | 708 | { |
709 | unsigned int irq; | 709 | unsigned int irq; |
710 | unsigned long iobase; | 710 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index a1a0663b82b..1530416e4fa 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c | |||
@@ -55,7 +55,7 @@ static struct pcmcia_device *pcmcia_cur_dev = NULL; | |||
55 | 55 | ||
56 | #define DIO700_SIZE 8 // size of io region used by board | 56 | #define DIO700_SIZE 8 // size of io region used by board |
57 | 57 | ||
58 | static int dio700_attach(struct comedi_device * dev, comedi_devconfig * it); | 58 | static int dio700_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
59 | static int dio700_detach(struct comedi_device * dev); | 59 | static int dio700_detach(struct comedi_device * dev); |
60 | 60 | ||
61 | enum dio700_bustype { pcmcia_bustype }; | 61 | enum dio700_bustype { pcmcia_bustype }; |
@@ -350,7 +350,7 @@ EXPORT_SYMBOL(subdev_700_init_irq); | |||
350 | EXPORT_SYMBOL(subdev_700_cleanup); | 350 | EXPORT_SYMBOL(subdev_700_cleanup); |
351 | EXPORT_SYMBOL(subdev_700_interrupt); | 351 | EXPORT_SYMBOL(subdev_700_interrupt); |
352 | 352 | ||
353 | static int dio700_attach(struct comedi_device * dev, comedi_devconfig * it) | 353 | static int dio700_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
354 | { | 354 | { |
355 | struct comedi_subdevice *s; | 355 | struct comedi_subdevice *s; |
356 | unsigned long iobase = 0; | 356 | unsigned long iobase = 0; |
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 5783a8f5773..ed734bb3647 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c | |||
@@ -56,7 +56,7 @@ static struct pcmcia_device *pcmcia_cur_dev = NULL; | |||
56 | 56 | ||
57 | #define DIO24_SIZE 4 // size of io region used by board | 57 | #define DIO24_SIZE 4 // size of io region used by board |
58 | 58 | ||
59 | static int dio24_attach(struct comedi_device * dev, comedi_devconfig * it); | 59 | static int dio24_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
60 | static int dio24_detach(struct comedi_device * dev); | 60 | static int dio24_detach(struct comedi_device * dev); |
61 | 61 | ||
62 | enum dio24_bustype { pcmcia_bustype }; | 62 | enum dio24_bustype { pcmcia_bustype }; |
@@ -107,7 +107,7 @@ static struct comedi_driver driver_dio24 = { | |||
107 | offset:sizeof(dio24_board), | 107 | offset:sizeof(dio24_board), |
108 | }; | 108 | }; |
109 | 109 | ||
110 | static int dio24_attach(struct comedi_device * dev, comedi_devconfig * it) | 110 | static int dio24_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
111 | { | 111 | { |
112 | struct comedi_subdevice *s; | 112 | struct comedi_subdevice *s; |
113 | unsigned long iobase = 0; | 113 | unsigned long iobase = 0; |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index f6ab0fde2c1..37898d8474c 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -163,7 +163,7 @@ NI manuals: | |||
163 | #define INIT_A1_BITS 0x70 // put hardware conversion counter output in harmless state (a1 mode 0) | 163 | #define INIT_A1_BITS 0x70 // put hardware conversion counter output in harmless state (a1 mode 0) |
164 | #define COUNTER_B_BASE_REG 0x18 | 164 | #define COUNTER_B_BASE_REG 0x18 |
165 | 165 | ||
166 | static int labpc_attach(struct comedi_device * dev, comedi_devconfig * it); | 166 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
167 | static int labpc_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 167 | static int labpc_cancel(struct comedi_device * dev, struct comedi_subdevice * s); |
168 | static irqreturn_t labpc_interrupt(int irq, void *d PT_REGS_ARG); | 168 | static irqreturn_t labpc_interrupt(int irq, void *d PT_REGS_ARG); |
169 | static int labpc_drain_fifo(struct comedi_device * dev); | 169 | static int labpc_drain_fifo(struct comedi_device * dev); |
@@ -643,7 +643,7 @@ int labpc_common_attach(struct comedi_device * dev, unsigned long iobase, | |||
643 | return 0; | 643 | return 0; |
644 | } | 644 | } |
645 | 645 | ||
646 | static int labpc_attach(struct comedi_device * dev, comedi_devconfig * it) | 646 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
647 | { | 647 | { |
648 | unsigned long iobase = 0; | 648 | unsigned long iobase = 0; |
649 | unsigned int irq = 0; | 649 | unsigned int irq = 0; |
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index f94cde904dd..ac0ce2f58f5 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c | |||
@@ -79,7 +79,7 @@ NI manuals: | |||
79 | 79 | ||
80 | static struct pcmcia_device *pcmcia_cur_dev = NULL; | 80 | static struct pcmcia_device *pcmcia_cur_dev = NULL; |
81 | 81 | ||
82 | static int labpc_attach(struct comedi_device * dev, comedi_devconfig * it); | 82 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
83 | 83 | ||
84 | static const labpc_board labpc_cs_boards[] = { | 84 | static const labpc_board labpc_cs_boards[] = { |
85 | { | 85 | { |
@@ -126,7 +126,7 @@ static struct comedi_driver driver_labpc_cs = { | |||
126 | .offset = sizeof(labpc_board), | 126 | .offset = sizeof(labpc_board), |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static int labpc_attach(struct comedi_device * dev, comedi_devconfig * it) | 129 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
130 | { | 130 | { |
131 | unsigned long iobase = 0; | 131 | unsigned long iobase = 0; |
132 | unsigned int irq = 0; | 132 | unsigned int irq = 0; |
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 52984b0a1b7..ce8c704565d 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c | |||
@@ -4289,7 +4289,7 @@ static int ni_alloc_private(struct comedi_device * dev) | |||
4289 | return 0; | 4289 | return 0; |
4290 | }; | 4290 | }; |
4291 | 4291 | ||
4292 | static int ni_E_init(struct comedi_device * dev, comedi_devconfig * it) | 4292 | static int ni_E_init(struct comedi_device * dev, struct comedi_devconfig * it) |
4293 | { | 4293 | { |
4294 | struct comedi_subdevice *s; | 4294 | struct comedi_subdevice *s; |
4295 | unsigned j; | 4295 | unsigned j; |
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index c3dad5937e0..9822f5e7022 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c | |||
@@ -225,7 +225,7 @@ static uint16_t mio_cs_win_in(struct comedi_device * dev, int addr) | |||
225 | return ret; | 225 | return ret; |
226 | } | 226 | } |
227 | 227 | ||
228 | static int mio_cs_attach(struct comedi_device * dev, comedi_devconfig * it); | 228 | static int mio_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
229 | static int mio_cs_detach(struct comedi_device * dev); | 229 | static int mio_cs_detach(struct comedi_device * dev); |
230 | static struct comedi_driver driver_ni_mio_cs = { | 230 | static struct comedi_driver driver_ni_mio_cs = { |
231 | driver_name:"ni_mio_cs", | 231 | driver_name:"ni_mio_cs", |
@@ -401,7 +401,7 @@ static void mio_cs_config(struct pcmcia_device *link) | |||
401 | link->dev_node = &dev_node; | 401 | link->dev_node = &dev_node; |
402 | } | 402 | } |
403 | 403 | ||
404 | static int mio_cs_attach(struct comedi_device * dev, comedi_devconfig * it) | 404 | static int mio_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
405 | { | 405 | { |
406 | struct pcmcia_device *link; | 406 | struct pcmcia_device *link; |
407 | unsigned int irq; | 407 | unsigned int irq; |
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index d7cdb38d509..339f059bab8 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c | |||
@@ -287,7 +287,7 @@ enum FPGA_Control_Bits { | |||
287 | #define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC) | 287 | #define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC) |
288 | #endif | 288 | #endif |
289 | 289 | ||
290 | static int nidio_attach(struct comedi_device * dev, comedi_devconfig * it); | 290 | static int nidio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
291 | static int nidio_detach(struct comedi_device * dev); | 291 | static int nidio_detach(struct comedi_device * dev); |
292 | static int ni_pcidio_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 292 | static int ni_pcidio_cancel(struct comedi_device * dev, struct comedi_subdevice * s); |
293 | 293 | ||
@@ -1149,7 +1149,7 @@ static int pci_6534_upload_firmware(struct comedi_device * dev, int options[]) | |||
1149 | return 0; | 1149 | return 0; |
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | static int nidio_attach(struct comedi_device * dev, comedi_devconfig * it) | 1152 | static int nidio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1153 | { | 1153 | { |
1154 | struct comedi_subdevice *s; | 1154 | struct comedi_subdevice *s; |
1155 | int i; | 1155 | int i; |
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index f67fa6dec22..3a2aba7c8dd 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c | |||
@@ -1207,7 +1207,7 @@ static const ni_board ni_boards[] = { | |||
1207 | 1207 | ||
1208 | #define n_pcimio_boards ((sizeof(ni_boards)/sizeof(ni_boards[0]))) | 1208 | #define n_pcimio_boards ((sizeof(ni_boards)/sizeof(ni_boards[0]))) |
1209 | 1209 | ||
1210 | static int pcimio_attach(struct comedi_device * dev, comedi_devconfig * it); | 1210 | static int pcimio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
1211 | static int pcimio_detach(struct comedi_device * dev); | 1211 | static int pcimio_detach(struct comedi_device * dev); |
1212 | static struct comedi_driver driver_pcimio = { | 1212 | static struct comedi_driver driver_pcimio = { |
1213 | driver_name: DRV_NAME, | 1213 | driver_name: DRV_NAME, |
@@ -1616,7 +1616,7 @@ static int pcimio_detach(struct comedi_device * dev) | |||
1616 | return 0; | 1616 | return 0; |
1617 | } | 1617 | } |
1618 | 1618 | ||
1619 | static int pcimio_attach(struct comedi_device * dev, comedi_devconfig * it) | 1619 | static int pcimio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1620 | { | 1620 | { |
1621 | int ret; | 1621 | int ret; |
1622 | 1622 | ||
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index 01ea3eb7554..3e83b6cf693 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c | |||
@@ -154,7 +154,7 @@ static const boardtype boardtypes[] = { | |||
154 | #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) | 154 | #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) |
155 | #define this_board ((const boardtype *)dev->board_ptr) | 155 | #define this_board ((const boardtype *)dev->board_ptr) |
156 | 156 | ||
157 | static int pcl711_attach(struct comedi_device * dev, comedi_devconfig * it); | 157 | static int pcl711_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
158 | static int pcl711_detach(struct comedi_device * dev); | 158 | static int pcl711_detach(struct comedi_device * dev); |
159 | static struct comedi_driver driver_pcl711 = { | 159 | static struct comedi_driver driver_pcl711 = { |
160 | driver_name:"pcl711", | 160 | driver_name:"pcl711", |
@@ -508,7 +508,7 @@ static int pcl711_detach(struct comedi_device * dev) | |||
508 | } | 508 | } |
509 | 509 | ||
510 | /* Initialization */ | 510 | /* Initialization */ |
511 | static int pcl711_attach(struct comedi_device * dev, comedi_devconfig * it) | 511 | static int pcl711_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
512 | { | 512 | { |
513 | int ret; | 513 | int ret; |
514 | unsigned long iobase; | 514 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c index 455117d043b..108649f31c1 100644 --- a/drivers/staging/comedi/drivers/pcl724.c +++ b/drivers/staging/comedi/drivers/pcl724.c | |||
@@ -56,7 +56,7 @@ See the source for configuration details. | |||
56 | 56 | ||
57 | // #define PCL724_IRQ 1 /* no IRQ support now */ | 57 | // #define PCL724_IRQ 1 /* no IRQ support now */ |
58 | 58 | ||
59 | static int pcl724_attach(struct comedi_device * dev, comedi_devconfig * it); | 59 | static int pcl724_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
60 | static int pcl724_detach(struct comedi_device * dev); | 60 | static int pcl724_detach(struct comedi_device * dev); |
61 | 61 | ||
62 | typedef struct { | 62 | typedef struct { |
@@ -122,7 +122,7 @@ static int subdev_8255mapped_cb(int dir, int port, int data, | |||
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | static int pcl724_attach(struct comedi_device * dev, comedi_devconfig * it) | 125 | static int pcl724_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
126 | { | 126 | { |
127 | unsigned long iobase; | 127 | unsigned long iobase; |
128 | unsigned int iorange; | 128 | unsigned int iorange; |
diff --git a/drivers/staging/comedi/drivers/pcl725.c b/drivers/staging/comedi/drivers/pcl725.c index d9f7c24bbdb..0766ba02bd0 100644 --- a/drivers/staging/comedi/drivers/pcl725.c +++ b/drivers/staging/comedi/drivers/pcl725.c | |||
@@ -20,7 +20,7 @@ Devices: [Advantech] PCL-725 (pcl725) | |||
20 | #define PCL725_DO 0 | 20 | #define PCL725_DO 0 |
21 | #define PCL725_DI 1 | 21 | #define PCL725_DI 1 |
22 | 22 | ||
23 | static int pcl725_attach(struct comedi_device * dev, comedi_devconfig * it); | 23 | static int pcl725_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
24 | static int pcl725_detach(struct comedi_device * dev); | 24 | static int pcl725_detach(struct comedi_device * dev); |
25 | static struct comedi_driver driver_pcl725 = { | 25 | static struct comedi_driver driver_pcl725 = { |
26 | driver_name:"pcl725", | 26 | driver_name:"pcl725", |
@@ -59,7 +59,7 @@ static int pcl725_di_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
59 | return 2; | 59 | return 2; |
60 | } | 60 | } |
61 | 61 | ||
62 | static int pcl725_attach(struct comedi_device * dev, comedi_devconfig * it) | 62 | static int pcl725_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
63 | { | 63 | { |
64 | struct comedi_subdevice *s; | 64 | struct comedi_subdevice *s; |
65 | unsigned long iobase; | 65 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c index f0c8b0af8d5..8f0425f280e 100644 --- a/drivers/staging/comedi/drivers/pcl726.c +++ b/drivers/staging/comedi/drivers/pcl726.c | |||
@@ -111,7 +111,7 @@ static const struct comedi_lrange *const rangelist_728[] = { | |||
111 | &range_4_20mA, &range_0_20mA | 111 | &range_4_20mA, &range_0_20mA |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static int pcl726_attach(struct comedi_device * dev, comedi_devconfig * it); | 114 | static int pcl726_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
115 | static int pcl726_detach(struct comedi_device * dev); | 115 | static int pcl726_detach(struct comedi_device * dev); |
116 | 116 | ||
117 | typedef struct { | 117 | typedef struct { |
@@ -237,7 +237,7 @@ static int pcl726_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
237 | return 2; | 237 | return 2; |
238 | } | 238 | } |
239 | 239 | ||
240 | static int pcl726_attach(struct comedi_device * dev, comedi_devconfig * it) | 240 | static int pcl726_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
241 | { | 241 | { |
242 | struct comedi_subdevice *s; | 242 | struct comedi_subdevice *s; |
243 | unsigned long iobase; | 243 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c index 05d9f76e933..f290e119586 100644 --- a/drivers/staging/comedi/drivers/pcl730.c +++ b/drivers/staging/comedi/drivers/pcl730.c | |||
@@ -26,7 +26,7 @@ The ACL-7130 card have an 8254 timer/counter not supported by this driver. | |||
26 | #define PCL730_DIO_LO 2 /* TTL Digital I/O low byte (D0-D7) */ | 26 | #define PCL730_DIO_LO 2 /* TTL Digital I/O low byte (D0-D7) */ |
27 | #define PCL730_DIO_HI 3 /* TTL Digital I/O high byte (D8-D15) */ | 27 | #define PCL730_DIO_HI 3 /* TTL Digital I/O high byte (D8-D15) */ |
28 | 28 | ||
29 | static int pcl730_attach(struct comedi_device * dev, comedi_devconfig * it); | 29 | static int pcl730_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
30 | static int pcl730_detach(struct comedi_device * dev); | 30 | static int pcl730_detach(struct comedi_device * dev); |
31 | 31 | ||
32 | typedef struct { | 32 | typedef struct { |
@@ -89,7 +89,7 @@ static int pcl730_di_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
89 | return 2; | 89 | return 2; |
90 | } | 90 | } |
91 | 91 | ||
92 | static int pcl730_attach(struct comedi_device * dev, comedi_devconfig * it) | 92 | static int pcl730_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
93 | { | 93 | { |
94 | struct comedi_subdevice *s; | 94 | struct comedi_subdevice *s; |
95 | unsigned long iobase; | 95 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index 7b0a95c0e98..07a109839b4 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c | |||
@@ -292,7 +292,7 @@ static const struct comedi_lrange range_a821pgh_ai = { 4, { | |||
292 | } | 292 | } |
293 | }; | 293 | }; |
294 | 294 | ||
295 | static int pcl812_attach(struct comedi_device * dev, comedi_devconfig * it); | 295 | static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
296 | static int pcl812_detach(struct comedi_device * dev); | 296 | static int pcl812_detach(struct comedi_device * dev); |
297 | 297 | ||
298 | typedef struct { | 298 | typedef struct { |
@@ -1262,7 +1262,7 @@ static void pcl812_reset(struct comedi_device * dev) | |||
1262 | /* | 1262 | /* |
1263 | ============================================================================== | 1263 | ============================================================================== |
1264 | */ | 1264 | */ |
1265 | static int pcl812_attach(struct comedi_device * dev, comedi_devconfig * it) | 1265 | static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1266 | { | 1266 | { |
1267 | int ret, subdev; | 1267 | int ret, subdev; |
1268 | unsigned long iobase; | 1268 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 9542d0e8e5f..1d1137f602a 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c | |||
@@ -146,7 +146,7 @@ static const boardtype boardtypes[] = { | |||
146 | #define devpriv ((pcl816_private *)dev->private) | 146 | #define devpriv ((pcl816_private *)dev->private) |
147 | #define this_board ((const boardtype *)dev->board_ptr) | 147 | #define this_board ((const boardtype *)dev->board_ptr) |
148 | 148 | ||
149 | static int pcl816_attach(struct comedi_device * dev, comedi_devconfig * it); | 149 | static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
150 | static int pcl816_detach(struct comedi_device * dev); | 150 | static int pcl816_detach(struct comedi_device * dev); |
151 | 151 | ||
152 | #ifdef unused | 152 | #ifdef unused |
@@ -1011,7 +1011,7 @@ static void free_resources(struct comedi_device * dev) | |||
1011 | Initialization | 1011 | Initialization |
1012 | 1012 | ||
1013 | */ | 1013 | */ |
1014 | static int pcl816_attach(struct comedi_device * dev, comedi_devconfig * it) | 1014 | static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1015 | { | 1015 | { |
1016 | int ret; | 1016 | int ret; |
1017 | unsigned long iobase; | 1017 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index 4b315c090ba..fb5ddad1873 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c | |||
@@ -244,7 +244,7 @@ static const struct comedi_lrange range718_bipolar0_5 = { 1, {BIP_RANGE(0.5),} } | |||
244 | static const struct comedi_lrange range718_unipolar2 = { 1, {UNI_RANGE(2),} }; | 244 | static const struct comedi_lrange range718_unipolar2 = { 1, {UNI_RANGE(2),} }; |
245 | static const struct comedi_lrange range718_unipolar1 = { 1, {BIP_RANGE(1),} }; | 245 | static const struct comedi_lrange range718_unipolar1 = { 1, {BIP_RANGE(1),} }; |
246 | 246 | ||
247 | static int pcl818_attach(struct comedi_device * dev, comedi_devconfig * it); | 247 | static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
248 | static int pcl818_detach(struct comedi_device * dev); | 248 | static int pcl818_detach(struct comedi_device * dev); |
249 | 249 | ||
250 | #ifdef unused | 250 | #ifdef unused |
@@ -1675,7 +1675,7 @@ static void free_resources(struct comedi_device * dev) | |||
1675 | Initialization | 1675 | Initialization |
1676 | 1676 | ||
1677 | */ | 1677 | */ |
1678 | static int pcl818_attach(struct comedi_device * dev, comedi_devconfig * it) | 1678 | static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
1679 | { | 1679 | { |
1680 | int ret; | 1680 | int ret; |
1681 | unsigned long iobase; | 1681 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c index 08a63ebfa62..ba4de985ff3 100644 --- a/drivers/staging/comedi/drivers/pcm3724.c +++ b/drivers/staging/comedi/drivers/pcm3724.c | |||
@@ -62,7 +62,7 @@ Copy/pasted/hacked from pcm724.c | |||
62 | #define CR_A_MODE(a) ((a)<<5) | 62 | #define CR_A_MODE(a) ((a)<<5) |
63 | #define CR_CW 0x80 | 63 | #define CR_CW 0x80 |
64 | 64 | ||
65 | static int pcm3724_attach(struct comedi_device * dev, comedi_devconfig * it); | 65 | static int pcm3724_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
66 | static int pcm3724_detach(struct comedi_device * dev); | 66 | static int pcm3724_detach(struct comedi_device * dev); |
67 | 67 | ||
68 | typedef struct { | 68 | typedef struct { |
@@ -251,7 +251,7 @@ static int subdev_3724_insn_config(struct comedi_device * dev, struct comedi_sub | |||
251 | return 1; | 251 | return 1; |
252 | } | 252 | } |
253 | 253 | ||
254 | static int pcm3724_attach(struct comedi_device * dev, comedi_devconfig * it) | 254 | static int pcm3724_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
255 | { | 255 | { |
256 | unsigned long iobase; | 256 | unsigned long iobase; |
257 | unsigned int iorange; | 257 | unsigned int iorange; |
diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c index 63b961b32e2..1de555fe645 100644 --- a/drivers/staging/comedi/drivers/pcm3730.c +++ b/drivers/staging/comedi/drivers/pcm3730.c | |||
@@ -28,7 +28,7 @@ Configuration options: | |||
28 | #define PCM3730_DIB 2 | 28 | #define PCM3730_DIB 2 |
29 | #define PCM3730_DIC 3 | 29 | #define PCM3730_DIC 3 |
30 | 30 | ||
31 | static int pcm3730_attach(struct comedi_device * dev, comedi_devconfig * it); | 31 | static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
32 | static int pcm3730_detach(struct comedi_device * dev); | 32 | static int pcm3730_detach(struct comedi_device * dev); |
33 | static struct comedi_driver driver_pcm3730 = { | 33 | static struct comedi_driver driver_pcm3730 = { |
34 | driver_name:"pcm3730", | 34 | driver_name:"pcm3730", |
@@ -63,7 +63,7 @@ static int pcm3730_di_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
63 | return 2; | 63 | return 2; |
64 | } | 64 | } |
65 | 65 | ||
66 | static int pcm3730_attach(struct comedi_device * dev, comedi_devconfig * it) | 66 | static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
67 | { | 67 | { |
68 | struct comedi_subdevice *s; | 68 | struct comedi_subdevice *s; |
69 | unsigned long iobase; | 69 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c index fe3990983ae..fc2a73d97c2 100644 --- a/drivers/staging/comedi/drivers/pcmad.c +++ b/drivers/staging/comedi/drivers/pcmad.c | |||
@@ -76,7 +76,7 @@ struct pcmad_priv_struct { | |||
76 | }; | 76 | }; |
77 | #define devpriv ((struct pcmad_priv_struct *)dev->private) | 77 | #define devpriv ((struct pcmad_priv_struct *)dev->private) |
78 | 78 | ||
79 | static int pcmad_attach(struct comedi_device * dev, comedi_devconfig * it); | 79 | static int pcmad_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
80 | static int pcmad_detach(struct comedi_device * dev); | 80 | static int pcmad_detach(struct comedi_device * dev); |
81 | static struct comedi_driver driver_pcmad = { | 81 | static struct comedi_driver driver_pcmad = { |
82 | driver_name:"pcmad", | 82 | driver_name:"pcmad", |
@@ -126,7 +126,7 @@ static int pcmad_ai_insn_read(struct comedi_device * dev, struct comedi_subdevic | |||
126 | * 2 0=single ended 1=differential | 126 | * 2 0=single ended 1=differential |
127 | * 3 0=straight binary 1=two's comp | 127 | * 3 0=straight binary 1=two's comp |
128 | */ | 128 | */ |
129 | static int pcmad_attach(struct comedi_device * dev, comedi_devconfig * it) | 129 | static int pcmad_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
130 | { | 130 | { |
131 | int ret; | 131 | int ret; |
132 | struct comedi_subdevice *s; | 132 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index d9f0b03486d..ad772685380 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c | |||
@@ -105,7 +105,7 @@ typedef struct { | |||
105 | * the board, and also about the kernel module that contains | 105 | * the board, and also about the kernel module that contains |
106 | * the device code. | 106 | * the device code. |
107 | */ | 107 | */ |
108 | static int pcmda12_attach(struct comedi_device * dev, comedi_devconfig * it); | 108 | static int pcmda12_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
109 | static int pcmda12_detach(struct comedi_device * dev); | 109 | static int pcmda12_detach(struct comedi_device * dev); |
110 | 110 | ||
111 | static void zero_chans(struct comedi_device * dev); | 111 | static void zero_chans(struct comedi_device * dev); |
@@ -149,7 +149,7 @@ static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
149 | * in the driver structure, dev->board_ptr contains that | 149 | * in the driver structure, dev->board_ptr contains that |
150 | * address. | 150 | * address. |
151 | */ | 151 | */ |
152 | static int pcmda12_attach(struct comedi_device * dev, comedi_devconfig * it) | 152 | static int pcmda12_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
153 | { | 153 | { |
154 | struct comedi_subdevice *s; | 154 | struct comedi_subdevice *s; |
155 | unsigned long iobase; | 155 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index e44dee964aa..85c20541870 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c | |||
@@ -264,7 +264,7 @@ typedef struct { | |||
264 | * the board, and also about the kernel module that contains | 264 | * the board, and also about the kernel module that contains |
265 | * the device code. | 265 | * the device code. |
266 | */ | 266 | */ |
267 | static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it); | 267 | static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
268 | static int pcmmio_detach(struct comedi_device * dev); | 268 | static int pcmmio_detach(struct comedi_device * dev); |
269 | 269 | ||
270 | static struct comedi_driver driver = { | 270 | static struct comedi_driver driver = { |
@@ -321,7 +321,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port); | |||
321 | * in the driver structure, dev->board_ptr contains that | 321 | * in the driver structure, dev->board_ptr contains that |
322 | * address. | 322 | * address. |
323 | */ | 323 | */ |
324 | static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it) | 324 | static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
325 | { | 325 | { |
326 | struct comedi_subdevice *s; | 326 | struct comedi_subdevice *s; |
327 | int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic, | 327 | int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic, |
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index fca574b6043..97ae34955d6 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c | |||
@@ -222,7 +222,7 @@ typedef struct { | |||
222 | * the board, and also about the kernel module that contains | 222 | * the board, and also about the kernel module that contains |
223 | * the device code. | 223 | * the device code. |
224 | */ | 224 | */ |
225 | static int pcmuio_attach(struct comedi_device * dev, comedi_devconfig * it); | 225 | static int pcmuio_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
226 | static int pcmuio_detach(struct comedi_device * dev); | 226 | static int pcmuio_detach(struct comedi_device * dev); |
227 | 227 | ||
228 | static struct comedi_driver driver = { | 228 | static struct comedi_driver driver = { |
@@ -279,7 +279,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port); | |||
279 | * in the driver structure, dev->board_ptr contains that | 279 | * in the driver structure, dev->board_ptr contains that |
280 | * address. | 280 | * address. |
281 | */ | 281 | */ |
282 | static int pcmuio_attach(struct comedi_device * dev, comedi_devconfig * it) | 282 | static int pcmuio_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
283 | { | 283 | { |
284 | struct comedi_subdevice *s; | 284 | struct comedi_subdevice *s; |
285 | int sdev_no, chans_left, n_subdevs, port, asic, thisasic_chanct = 0; | 285 | int sdev_no, chans_left, n_subdevs, port, asic, thisasic_chanct = 0; |
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c index 39a6f94f2e1..8a0bf685493 100644 --- a/drivers/staging/comedi/drivers/poc.c +++ b/drivers/staging/comedi/drivers/poc.c | |||
@@ -41,7 +41,7 @@ Configuration options: | |||
41 | 41 | ||
42 | #include <linux/ioport.h> | 42 | #include <linux/ioport.h> |
43 | 43 | ||
44 | static int poc_attach(struct comedi_device * dev, comedi_devconfig * it); | 44 | static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
45 | static int poc_detach(struct comedi_device * dev); | 45 | static int poc_detach(struct comedi_device * dev); |
46 | static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 46 | static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, |
47 | struct comedi_insn * insn, unsigned int * data); | 47 | struct comedi_insn * insn, unsigned int * data); |
@@ -113,7 +113,7 @@ static struct comedi_driver driver_poc = { | |||
113 | offset:sizeof(boards[0]), | 113 | offset:sizeof(boards[0]), |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static int poc_attach(struct comedi_device * dev, comedi_devconfig * it) | 116 | static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
117 | { | 117 | { |
118 | struct comedi_subdevice *s; | 118 | struct comedi_subdevice *s; |
119 | unsigned long iobase; | 119 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 6494312cb16..f405341c95f 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c | |||
@@ -197,7 +197,7 @@ static const struct comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} }; | |||
197 | 197 | ||
198 | /* comedi interface code */ | 198 | /* comedi interface code */ |
199 | 199 | ||
200 | static int daqp_attach(struct comedi_device * dev, comedi_devconfig * it); | 200 | static int daqp_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
201 | static int daqp_detach(struct comedi_device * dev); | 201 | static int daqp_detach(struct comedi_device * dev); |
202 | static struct comedi_driver driver_daqp = { | 202 | static struct comedi_driver driver_daqp = { |
203 | driver_name:"quatech_daqp_cs", | 203 | driver_name:"quatech_daqp_cs", |
@@ -856,7 +856,7 @@ static int daqp_do_insn_write(struct comedi_device * dev, struct comedi_subdevic | |||
856 | * when it is inserted. | 856 | * when it is inserted. |
857 | */ | 857 | */ |
858 | 858 | ||
859 | static int daqp_attach(struct comedi_device * dev, comedi_devconfig * it) | 859 | static int daqp_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
860 | { | 860 | { |
861 | int ret; | 861 | int ret; |
862 | local_info_t *local = dev_table[it->options[0]]; | 862 | local_info_t *local = dev_table[it->options[0]]; |
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index c919b8efdb3..ca347f21d14 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c | |||
@@ -680,7 +680,7 @@ struct rtdPrivate { | |||
680 | * the board, and also about the kernel module that contains | 680 | * the board, and also about the kernel module that contains |
681 | * the device code. | 681 | * the device code. |
682 | */ | 682 | */ |
683 | static int rtd_attach(struct comedi_device *dev, comedi_devconfig *it); | 683 | static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
684 | static int rtd_detach(struct comedi_device *dev); | 684 | static int rtd_detach(struct comedi_device *dev); |
685 | 685 | ||
686 | static struct comedi_driver rtd520Driver = { | 686 | static struct comedi_driver rtd520Driver = { |
@@ -715,7 +715,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev); | |||
715 | * in the driver structure, dev->board_ptr contains that | 715 | * in the driver structure, dev->board_ptr contains that |
716 | * address. | 716 | * address. |
717 | */ | 717 | */ |
718 | static int rtd_attach(struct comedi_device *dev, comedi_devconfig *it) | 718 | static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
719 | { /* board name and options flags */ | 719 | { /* board name and options flags */ |
720 | struct comedi_subdevice *s; | 720 | struct comedi_subdevice *s; |
721 | struct pci_dev *pcidev; | 721 | struct pci_dev *pcidev; |
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index a93f5705bf1..bd579711a51 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c | |||
@@ -129,7 +129,7 @@ static const boardtype boardtypes[] = { | |||
129 | 129 | ||
130 | #define this_board ((const boardtype *)dev->board_ptr) | 130 | #define this_board ((const boardtype *)dev->board_ptr) |
131 | 131 | ||
132 | static int rti800_attach(struct comedi_device * dev, comedi_devconfig * it); | 132 | static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
133 | static int rti800_detach(struct comedi_device * dev); | 133 | static int rti800_detach(struct comedi_device * dev); |
134 | static struct comedi_driver driver_rti800 = { | 134 | static struct comedi_driver driver_rti800 = { |
135 | driver_name:"rti800", | 135 | driver_name:"rti800", |
@@ -307,7 +307,7 @@ static int rti800_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
307 | options[8] - dac1 coding | 307 | options[8] - dac1 coding |
308 | */ | 308 | */ |
309 | 309 | ||
310 | static int rti800_attach(struct comedi_device * dev, comedi_devconfig * it) | 310 | static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
311 | { | 311 | { |
312 | unsigned int irq; | 312 | unsigned int irq; |
313 | unsigned long iobase; | 313 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c index 3249d08c3ce..656742be898 100644 --- a/drivers/staging/comedi/drivers/rti802.c +++ b/drivers/staging/comedi/drivers/rti802.c | |||
@@ -47,7 +47,7 @@ Configuration Options: | |||
47 | #define RTI802_DATALOW 1 | 47 | #define RTI802_DATALOW 1 |
48 | #define RTI802_DATAHIGH 2 | 48 | #define RTI802_DATAHIGH 2 |
49 | 49 | ||
50 | static int rti802_attach(struct comedi_device * dev, comedi_devconfig * it); | 50 | static int rti802_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
51 | static int rti802_detach(struct comedi_device * dev); | 51 | static int rti802_detach(struct comedi_device * dev); |
52 | static struct comedi_driver driver_rti802 = { | 52 | static struct comedi_driver driver_rti802 = { |
53 | driver_name:"rti802", | 53 | driver_name:"rti802", |
@@ -96,7 +96,7 @@ static int rti802_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
96 | return i; | 96 | return i; |
97 | } | 97 | } |
98 | 98 | ||
99 | static int rti802_attach(struct comedi_device * dev, comedi_devconfig * it) | 99 | static int rti802_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
100 | { | 100 | { |
101 | struct comedi_subdevice *s; | 101 | struct comedi_subdevice *s; |
102 | int i; | 102 | int i; |
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index b9b48b2f222..e5ee54332e8 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c | |||
@@ -215,7 +215,7 @@ typedef struct { | |||
215 | * the board, and also about the kernel module that contains | 215 | * the board, and also about the kernel module that contains |
216 | * the device code. | 216 | * the device code. |
217 | */ | 217 | */ |
218 | static int s526_attach(struct comedi_device * dev, comedi_devconfig * it); | 218 | static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
219 | static int s526_detach(struct comedi_device * dev); | 219 | static int s526_detach(struct comedi_device * dev); |
220 | static struct comedi_driver driver_s526 = { | 220 | static struct comedi_driver driver_s526 = { |
221 | driver_name:"s526", | 221 | driver_name:"s526", |
@@ -270,7 +270,7 @@ static int s526_dio_insn_config(struct comedi_device * dev, struct comedi_subdev | |||
270 | * in the driver structure, dev->board_ptr contains that | 270 | * in the driver structure, dev->board_ptr contains that |
271 | * address. | 271 | * address. |
272 | */ | 272 | */ |
273 | static int s526_attach(struct comedi_device * dev, comedi_devconfig * it) | 273 | static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
274 | { | 274 | { |
275 | struct comedi_subdevice *s; | 275 | struct comedi_subdevice *s; |
276 | int iobase; | 276 | int iobase; |
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 7385031f2b8..3e6f1f0d99e 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c | |||
@@ -118,7 +118,7 @@ static DEFINE_PCI_DEVICE_TABLE(s626_pci_table) = { | |||
118 | 118 | ||
119 | MODULE_DEVICE_TABLE(pci, s626_pci_table); | 119 | MODULE_DEVICE_TABLE(pci, s626_pci_table); |
120 | 120 | ||
121 | static int s626_attach(struct comedi_device *dev, comedi_devconfig *it); | 121 | static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
122 | static int s626_detach(struct comedi_device *dev); | 122 | static int s626_detach(struct comedi_device *dev); |
123 | 123 | ||
124 | static struct comedi_driver driver_s626 = { | 124 | static struct comedi_driver driver_s626 = { |
@@ -485,7 +485,7 @@ static const struct comedi_lrange s626_range_table = { 2, { | |||
485 | } | 485 | } |
486 | }; | 486 | }; |
487 | 487 | ||
488 | static int s626_attach(struct comedi_device *dev, comedi_devconfig *it) | 488 | static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
489 | { | 489 | { |
490 | /* uint8_t PollList; */ | 490 | /* uint8_t PollList; */ |
491 | /* uint16_t AdcData; */ | 491 | /* uint16_t AdcData; */ |
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c index 2271bd45fc0..ca41baa3764 100644 --- a/drivers/staging/comedi/drivers/serial2002.c +++ b/drivers/staging/comedi/drivers/serial2002.c | |||
@@ -85,7 +85,7 @@ typedef struct { | |||
85 | */ | 85 | */ |
86 | #define devpriv ((serial2002_private *)dev->private) | 86 | #define devpriv ((serial2002_private *)dev->private) |
87 | 87 | ||
88 | static int serial2002_attach(struct comedi_device * dev, comedi_devconfig * it); | 88 | static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
89 | static int serial2002_detach(struct comedi_device * dev); | 89 | static int serial2002_detach(struct comedi_device * dev); |
90 | struct comedi_driver driver_serial2002 = { | 90 | struct comedi_driver driver_serial2002 = { |
91 | driver_name:"serial2002", | 91 | driver_name:"serial2002", |
@@ -776,7 +776,7 @@ static int serial2002_ei_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
776 | return n; | 776 | return n; |
777 | } | 777 | } |
778 | 778 | ||
779 | static int serial2002_attach(struct comedi_device * dev, comedi_devconfig * it) | 779 | static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
780 | { | 780 | { |
781 | struct comedi_subdevice *s; | 781 | struct comedi_subdevice *s; |
782 | 782 | ||
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c index 2d25354b9ac..b8cdd6f8fc0 100644 --- a/drivers/staging/comedi/drivers/skel.c +++ b/drivers/staging/comedi/drivers/skel.c | |||
@@ -151,7 +151,7 @@ typedef struct { | |||
151 | * the board, and also about the kernel module that contains | 151 | * the board, and also about the kernel module that contains |
152 | * the device code. | 152 | * the device code. |
153 | */ | 153 | */ |
154 | static int skel_attach(struct comedi_device * dev, comedi_devconfig * it); | 154 | static int skel_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
155 | static int skel_detach(struct comedi_device * dev); | 155 | static int skel_detach(struct comedi_device * dev); |
156 | static struct comedi_driver driver_skel = { | 156 | static struct comedi_driver driver_skel = { |
157 | driver_name:"dummy", | 157 | driver_name:"dummy", |
@@ -201,7 +201,7 @@ static int skel_ns_to_timer(unsigned int *ns, int round); | |||
201 | * in the driver structure, dev->board_ptr contains that | 201 | * in the driver structure, dev->board_ptr contains that |
202 | * address. | 202 | * address. |
203 | */ | 203 | */ |
204 | static int skel_attach(struct comedi_device * dev, comedi_devconfig * it) | 204 | static int skel_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
205 | { | 205 | { |
206 | struct comedi_subdevice *s; | 206 | struct comedi_subdevice *s; |
207 | 207 | ||
diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c index cf3adf77ea1..8965df7a93c 100644 --- a/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/drivers/staging/comedi/drivers/ssv_dnp.c | |||
@@ -87,7 +87,7 @@ typedef struct { | |||
87 | /* In the following section we define the API of this driver. */ | 87 | /* In the following section we define the API of this driver. */ |
88 | /* ------------------------------------------------------------------------- */ | 88 | /* ------------------------------------------------------------------------- */ |
89 | 89 | ||
90 | static int dnp_attach(struct comedi_device * dev, comedi_devconfig * it); | 90 | static int dnp_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
91 | static int dnp_detach(struct comedi_device * dev); | 91 | static int dnp_detach(struct comedi_device * dev); |
92 | 92 | ||
93 | static struct comedi_driver driver_dnp = { | 93 | static struct comedi_driver driver_dnp = { |
@@ -115,7 +115,7 @@ static int dnp_dio_insn_config(struct comedi_device * dev, | |||
115 | /* dev->board_ptr contains that address. */ | 115 | /* dev->board_ptr contains that address. */ |
116 | /* ------------------------------------------------------------------------- */ | 116 | /* ------------------------------------------------------------------------- */ |
117 | 117 | ||
118 | static int dnp_attach(struct comedi_device * dev, comedi_devconfig * it) | 118 | static int dnp_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
119 | { | 119 | { |
120 | 120 | ||
121 | struct comedi_subdevice *s; | 121 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c index 04b7ec65b63..bf541d472ee 100644 --- a/drivers/staging/comedi/drivers/unioxx5.c +++ b/drivers/staging/comedi/drivers/unioxx5.c | |||
@@ -80,7 +80,7 @@ typedef struct unioxx5_subd_priv { | |||
80 | unsigned char usp_prev_cn_val[3]; /* previous channel value */ | 80 | unsigned char usp_prev_cn_val[3]; /* previous channel value */ |
81 | } unioxx5_subd_priv; | 81 | } unioxx5_subd_priv; |
82 | 82 | ||
83 | static int unioxx5_attach(struct comedi_device * dev, comedi_devconfig * it); | 83 | static int unioxx5_attach(struct comedi_device * dev, struct comedi_devconfig * it); |
84 | static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdevice * subdev, | 84 | static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdevice * subdev, |
85 | struct comedi_insn * insn, unsigned int * data); | 85 | struct comedi_insn * insn, unsigned int * data); |
86 | static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevice * subdev, | 86 | static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevice * subdev, |
@@ -111,7 +111,7 @@ static struct comedi_driver unioxx5_driver = { | |||
111 | 111 | ||
112 | COMEDI_INITCLEANUP(unioxx5_driver); | 112 | COMEDI_INITCLEANUP(unioxx5_driver); |
113 | 113 | ||
114 | static int unioxx5_attach(struct comedi_device * dev, comedi_devconfig * it) | 114 | static int unioxx5_attach(struct comedi_device * dev, struct comedi_devconfig * it) |
115 | { | 115 | { |
116 | int iobase, i, n_subd; | 116 | int iobase, i, n_subd; |
117 | int id, num, ba; | 117 | int id, num, ba; |
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 692df7a0e5e..d0b59e98314 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c | |||
@@ -2703,7 +2703,7 @@ static void usbduxsub_disconnect(struct usb_interface *intf) | |||
2703 | } | 2703 | } |
2704 | 2704 | ||
2705 | /* is called when comedi-config is called */ | 2705 | /* is called when comedi-config is called */ |
2706 | static int usbdux_attach(struct comedi_device *dev, comedi_devconfig *it) | 2706 | static int usbdux_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
2707 | { | 2707 | { |
2708 | int ret; | 2708 | int ret; |
2709 | int index; | 2709 | int index; |
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c index d1ea6ed934e..2fb64de3f86 100644 --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c | |||
@@ -1715,7 +1715,7 @@ static void usbduxfastsub_disconnect(struct usb_interface *intf) | |||
1715 | /* | 1715 | /* |
1716 | * is called when comedi-config is called | 1716 | * is called when comedi-config is called |
1717 | */ | 1717 | */ |
1718 | static int usbduxfast_attach(struct comedi_device *dev, comedi_devconfig *it) | 1718 | static int usbduxfast_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1719 | { | 1719 | { |
1720 | int ret; | 1720 | int ret; |
1721 | int index; | 1721 | int index; |