aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-07-07 20:59:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:05 -0400
commit1e212f3645a6b355de8c43a23376bc0e2ac49a63 (patch)
tree89324df417c19a1a63efb2ec6630e7d4b47181a0 /drivers/net
parentbf45d9b0ac108b11245203ebb082d30f5059846b (diff)
[PATCH] pcmcia: move event handler
Move the "event handler" to struct pcmcia_driver -- the unified event handler will disappear really soon, but switching it to struct pcmcia_driver in the meantime allows for better "step-by-step" patches. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/pcmcia/3c574_cs.c6
-rw-r--r--drivers/net/pcmcia/3c589_cs.c6
-rw-r--r--drivers/net/pcmcia/axnet_cs.c6
-rw-r--r--drivers/net/pcmcia/com20020_cs.c6
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c6
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c6
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c6
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c6
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c5
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c6
-rw-r--r--drivers/net/wireless/airo_cs.c6
-rw-r--r--drivers/net/wireless/atmel_cs.c16
-rw-r--r--drivers/net/wireless/netwave_cs.c6
-rw-r--r--drivers/net/wireless/orinoco_cs.c6
-rw-r--r--drivers/net/wireless/ray_cs.c6
-rw-r--r--drivers/net/wireless/wavelan_cs.c7
-rw-r--r--drivers/net/wireless/wl3501_cs.c18
17 files changed, 27 insertions, 97 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index f0fc04bd37c4..c942964a49d2 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -312,11 +312,6 @@ static dev_link_t *tc574_attach(void)
312 link->next = dev_list; 312 link->next = dev_list;
313 dev_list = link; 313 dev_list = link;
314 client_reg.dev_info = &dev_info; 314 client_reg.dev_info = &dev_info;
315 client_reg.EventMask =
316 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
317 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
318 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
319 client_reg.event_handler = &tc574_event;
320 client_reg.Version = 0x0210; 315 client_reg.Version = 0x0210;
321 client_reg.event_callback_args.client_data = link; 316 client_reg.event_callback_args.client_data = link;
322 ret = pcmcia_register_client(&link->handle, &client_reg); 317 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1299,6 +1294,7 @@ static struct pcmcia_driver tc574_driver = {
1299 .name = "3c574_cs", 1294 .name = "3c574_cs",
1300 }, 1295 },
1301 .attach = tc574_attach, 1296 .attach = tc574_attach,
1297 .event = tc574_event,
1302 .detach = tc574_detach, 1298 .detach = tc574_detach,
1303 .id_table = tc574_ids, 1299 .id_table = tc574_ids,
1304}; 1300};
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 8fa1b5f0fb68..810864c6d1ea 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -226,11 +226,6 @@ static dev_link_t *tc589_attach(void)
226 link->next = dev_list; 226 link->next = dev_list;
227 dev_list = link; 227 dev_list = link;
228 client_reg.dev_info = &dev_info; 228 client_reg.dev_info = &dev_info;
229 client_reg.EventMask =
230 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
231 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
232 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
233 client_reg.event_handler = &tc589_event;
234 client_reg.Version = 0x0210; 229 client_reg.Version = 0x0210;
235 client_reg.event_callback_args.client_data = link; 230 client_reg.event_callback_args.client_data = link;
236 ret = pcmcia_register_client(&link->handle, &client_reg); 231 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1074,6 +1069,7 @@ static struct pcmcia_driver tc589_driver = {
1074 .name = "3c589_cs", 1069 .name = "3c589_cs",
1075 }, 1070 },
1076 .attach = tc589_attach, 1071 .attach = tc589_attach,
1072 .event = tc589_event,
1077 .detach = tc589_detach, 1073 .detach = tc589_detach,
1078 .id_table = tc589_ids, 1074 .id_table = tc589_ids,
1079}; 1075};
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 23ce77b1d5b0..3d01079598c8 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -181,11 +181,6 @@ static dev_link_t *axnet_attach(void)
181 link->next = dev_list; 181 link->next = dev_list;
182 dev_list = link; 182 dev_list = link;
183 client_reg.dev_info = &dev_info; 183 client_reg.dev_info = &dev_info;
184 client_reg.EventMask =
185 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
186 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
187 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
188 client_reg.event_handler = &axnet_event;
189 client_reg.Version = 0x0210; 184 client_reg.Version = 0x0210;
190 client_reg.event_callback_args.client_data = link; 185 client_reg.event_callback_args.client_data = link;
191 ret = pcmcia_register_client(&link->handle, &client_reg); 186 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -884,6 +879,7 @@ static struct pcmcia_driver axnet_cs_driver = {
884 .name = "axnet_cs", 879 .name = "axnet_cs",
885 }, 880 },
886 .attach = axnet_attach, 881 .attach = axnet_attach,
882 .event = axnet_event,
887 .detach = axnet_detach, 883 .detach = axnet_detach,
888 .id_table = axnet_ids, 884 .id_table = axnet_ids,
889}; 885};
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 68d58cc58d31..b5119607d5af 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -200,11 +200,6 @@ static dev_link_t *com20020_attach(void)
200 link->next = dev_list; 200 link->next = dev_list;
201 dev_list = link; 201 dev_list = link;
202 client_reg.dev_info = &dev_info; 202 client_reg.dev_info = &dev_info;
203 client_reg.EventMask =
204 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
205 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
206 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
207 client_reg.event_handler = &com20020_event;
208 client_reg.Version = 0x0210; 203 client_reg.Version = 0x0210;
209 client_reg.event_callback_args.client_data = link; 204 client_reg.event_callback_args.client_data = link;
210 ret = pcmcia_register_client(&link->handle, &client_reg); 205 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -495,6 +490,7 @@ static struct pcmcia_driver com20020_cs_driver = {
495 .name = "com20020_cs", 490 .name = "com20020_cs",
496 }, 491 },
497 .attach = com20020_attach, 492 .attach = com20020_attach,
493 .event = com20020_event,
498 .detach = com20020_detach, 494 .detach = com20020_detach,
499 .id_table = com20020_ids, 495 .id_table = com20020_ids,
500}; 496};
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 917adbbf0b5b..c7d9bb1da417 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -288,11 +288,6 @@ static dev_link_t *fmvj18x_attach(void)
288 link->next = dev_list; 288 link->next = dev_list;
289 dev_list = link; 289 dev_list = link;
290 client_reg.dev_info = &dev_info; 290 client_reg.dev_info = &dev_info;
291 client_reg.EventMask =
292 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
293 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
294 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
295 client_reg.event_handler = &fmvj18x_event;
296 client_reg.Version = 0x0210; 291 client_reg.Version = 0x0210;
297 client_reg.event_callback_args.client_data = link; 292 client_reg.event_callback_args.client_data = link;
298 ret = pcmcia_register_client(&link->handle, &client_reg); 293 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -797,6 +792,7 @@ static struct pcmcia_driver fmvj18x_cs_driver = {
797 .name = "fmvj18x_cs", 792 .name = "fmvj18x_cs",
798 }, 793 },
799 .attach = fmvj18x_attach, 794 .attach = fmvj18x_attach,
795 .event = fmvj18x_event,
800 .detach = fmvj18x_detach, 796 .detach = fmvj18x_detach,
801 .id_table = fmvj18x_ids, 797 .id_table = fmvj18x_ids,
802}; 798};
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index cf6d073ea558..39cec4a1e4b3 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -190,11 +190,6 @@ static dev_link_t *ibmtr_attach(void)
190 link->next = dev_list; 190 link->next = dev_list;
191 dev_list = link; 191 dev_list = link;
192 client_reg.dev_info = &dev_info; 192 client_reg.dev_info = &dev_info;
193 client_reg.EventMask =
194 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
195 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
196 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
197 client_reg.event_handler = &ibmtr_event;
198 client_reg.Version = 0x0210; 193 client_reg.Version = 0x0210;
199 client_reg.event_callback_args.client_data = link; 194 client_reg.event_callback_args.client_data = link;
200 ret = pcmcia_register_client(&link->handle, &client_reg); 195 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -521,6 +516,7 @@ static struct pcmcia_driver ibmtr_cs_driver = {
521 .name = "ibmtr_cs", 516 .name = "ibmtr_cs",
522 }, 517 },
523 .attach = ibmtr_attach, 518 .attach = ibmtr_attach,
519 .event = ibmtr_event,
524 .detach = ibmtr_detach, 520 .detach = ibmtr_detach,
525 .id_table = ibmtr_ids, 521 .id_table = ibmtr_ids,
526}; 522};
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index b86e7253fbfc..49124dc26b35 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -502,11 +502,6 @@ static dev_link_t *nmclan_attach(void)
502 link->next = dev_list; 502 link->next = dev_list;
503 dev_list = link; 503 dev_list = link;
504 client_reg.dev_info = &dev_info; 504 client_reg.dev_info = &dev_info;
505 client_reg.EventMask =
506 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
507 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
508 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
509 client_reg.event_handler = &nmclan_event;
510 client_reg.Version = 0x0210; 505 client_reg.Version = 0x0210;
511 client_reg.event_callback_args.client_data = link; 506 client_reg.event_callback_args.client_data = link;
512 ret = pcmcia_register_client(&link->handle, &client_reg); 507 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1688,6 +1683,7 @@ static struct pcmcia_driver nmclan_cs_driver = {
1688 .name = "nmclan_cs", 1683 .name = "nmclan_cs",
1689 }, 1684 },
1690 .attach = nmclan_attach, 1685 .attach = nmclan_attach,
1686 .event = nmclan_event,
1691 .detach = nmclan_detach, 1687 .detach = nmclan_detach,
1692 .id_table = nmclan_ids, 1688 .id_table = nmclan_ids,
1693}; 1689};
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 855a45d062b1..b22b354af5c0 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -276,11 +276,6 @@ static dev_link_t *pcnet_attach(void)
276 link->next = dev_list; 276 link->next = dev_list;
277 dev_list = link; 277 dev_list = link;
278 client_reg.dev_info = &dev_info; 278 client_reg.dev_info = &dev_info;
279 client_reg.EventMask =
280 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
281 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
282 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
283 client_reg.event_handler = &pcnet_event;
284 client_reg.Version = 0x0210; 279 client_reg.Version = 0x0210;
285 client_reg.event_callback_args.client_data = link; 280 client_reg.event_callback_args.client_data = link;
286 ret = pcmcia_register_client(&link->handle, &client_reg); 281 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1844,6 +1839,7 @@ static struct pcmcia_driver pcnet_driver = {
1844 .name = "pcnet_cs", 1839 .name = "pcnet_cs",
1845 }, 1840 },
1846 .attach = pcnet_attach, 1841 .attach = pcnet_attach,
1842 .event = pcnet_event,
1847 .detach = pcnet_detach, 1843 .detach = pcnet_detach,
1848 .owner = THIS_MODULE, 1844 .owner = THIS_MODULE,
1849 .id_table = pcnet_ids, 1845 .id_table = pcnet_ids,
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index bc01c88c6709..6b5471dfb554 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -370,10 +370,6 @@ static dev_link_t *smc91c92_attach(void)
370 link->next = dev_list; 370 link->next = dev_list;
371 dev_list = link; 371 dev_list = link;
372 client_reg.dev_info = &dev_info; 372 client_reg.dev_info = &dev_info;
373 client_reg.EventMask = CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
374 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
375 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
376 client_reg.event_handler = &smc91c92_event;
377 client_reg.Version = 0x0210; 373 client_reg.Version = 0x0210;
378 client_reg.event_callback_args.client_data = link; 374 client_reg.event_callback_args.client_data = link;
379 ret = pcmcia_register_client(&link->handle, &client_reg); 375 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -2365,6 +2361,7 @@ static struct pcmcia_driver smc91c92_cs_driver = {
2365 .name = "smc91c92_cs", 2361 .name = "smc91c92_cs",
2366 }, 2362 },
2367 .attach = smc91c92_attach, 2363 .attach = smc91c92_attach,
2364 .event = smc91c92_event,
2368 .detach = smc91c92_detach, 2365 .detach = smc91c92_detach,
2369 .id_table = smc91c92_ids, 2366 .id_table = smc91c92_ids,
2370}; 2367};
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 0cd225e1595c..03d4c0c6b3fd 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -619,11 +619,6 @@ xirc2ps_attach(void)
619 link->next = dev_list; 619 link->next = dev_list;
620 dev_list = link; 620 dev_list = link;
621 client_reg.dev_info = &dev_info; 621 client_reg.dev_info = &dev_info;
622 client_reg.EventMask =
623 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
624 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
625 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
626 client_reg.event_handler = &xirc2ps_event;
627 client_reg.Version = 0x0210; 622 client_reg.Version = 0x0210;
628 client_reg.event_callback_args.client_data = link; 623 client_reg.event_callback_args.client_data = link;
629 if ((err = pcmcia_register_client(&link->handle, &client_reg))) { 624 if ((err = pcmcia_register_client(&link->handle, &client_reg))) {
@@ -2016,6 +2011,7 @@ static struct pcmcia_driver xirc2ps_cs_driver = {
2016 .name = "xirc2ps_cs", 2011 .name = "xirc2ps_cs",
2017 }, 2012 },
2018 .attach = xirc2ps_attach, 2013 .attach = xirc2ps_attach,
2014 .event = xirc2ps_event,
2019 .detach = xirc2ps_detach, 2015 .detach = xirc2ps_detach,
2020 .id_table = xirc2ps_ids, 2016 .id_table = xirc2ps_ids,
2021}; 2017};
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index f10a9523034a..fd46393e743e 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -210,11 +210,6 @@ static dev_link_t *airo_attach(void)
210 link->next = dev_list; 210 link->next = dev_list;
211 dev_list = link; 211 dev_list = link;
212 client_reg.dev_info = &dev_info; 212 client_reg.dev_info = &dev_info;
213 client_reg.EventMask =
214 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
215 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
216 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
217 client_reg.event_handler = &airo_event;
218 client_reg.Version = 0x0210; 213 client_reg.Version = 0x0210;
219 client_reg.event_callback_args.client_data = link; 214 client_reg.event_callback_args.client_data = link;
220 ret = pcmcia_register_client(&link->handle, &client_reg); 215 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -574,6 +569,7 @@ static struct pcmcia_driver airo_driver = {
574 .name = "airo_cs", 569 .name = "airo_cs",
575 }, 570 },
576 .attach = airo_attach, 571 .attach = airo_attach,
572 .event = airo_event,
577 .detach = airo_detach, 573 .detach = airo_detach,
578 .id_table = airo_ids, 574 .id_table = airo_ids,
579}; 575};
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 86379d4998ac..863be2995036 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -218,11 +218,6 @@ static dev_link_t *atmel_attach(void)
218 link->next = dev_list; 218 link->next = dev_list;
219 dev_list = link; 219 dev_list = link;
220 client_reg.dev_info = &dev_info; 220 client_reg.dev_info = &dev_info;
221 client_reg.EventMask =
222 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
223 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
224 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
225 client_reg.event_handler = &atmel_event;
226 client_reg.Version = 0x0210; 221 client_reg.Version = 0x0210;
227 client_reg.event_callback_args.client_data = link; 222 client_reg.event_callback_args.client_data = link;
228 ret = pcmcia_register_client(&link->handle, &client_reg); 223 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -668,12 +663,13 @@ static struct pcmcia_device_id atmel_ids[] = {
668MODULE_DEVICE_TABLE(pcmcia, atmel_ids); 663MODULE_DEVICE_TABLE(pcmcia, atmel_ids);
669 664
670static struct pcmcia_driver atmel_driver = { 665static struct pcmcia_driver atmel_driver = {
671 .owner = THIS_MODULE, 666 .owner = THIS_MODULE,
672 .drv = { 667 .drv = {
673 .name = "atmel_cs", 668 .name = "atmel_cs",
674 }, 669 },
675 .attach = atmel_attach, 670 .attach = atmel_attach,
676 .detach = atmel_detach, 671 .event = atmel_event,
672 .detach = atmel_detach,
677 .id_table = atmel_ids, 673 .id_table = atmel_ids,
678}; 674};
679 675
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index e12bd75b2694..bdd3e7083d9e 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -491,11 +491,6 @@ static dev_link_t *netwave_attach(void)
491 link->next = dev_list; 491 link->next = dev_list;
492 dev_list = link; 492 dev_list = link;
493 client_reg.dev_info = &dev_info; 493 client_reg.dev_info = &dev_info;
494 client_reg.EventMask =
495 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
496 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
497 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
498 client_reg.event_handler = &netwave_event;
499 client_reg.Version = 0x0210; 494 client_reg.Version = 0x0210;
500 client_reg.event_callback_args.client_data = link; 495 client_reg.event_callback_args.client_data = link;
501 ret = pcmcia_register_client(&link->handle, &client_reg); 496 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1680,6 +1675,7 @@ static struct pcmcia_driver netwave_driver = {
1680 .name = "netwave_cs", 1675 .name = "netwave_cs",
1681 }, 1676 },
1682 .attach = netwave_attach, 1677 .attach = netwave_attach,
1678 .event = netwave_event,
1683 .detach = netwave_detach, 1679 .detach = netwave_detach,
1684 .id_table = netwave_ids, 1680 .id_table = netwave_ids,
1685}; 1681};
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 597c4586d049..c883404b1d59 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -186,11 +186,6 @@ orinoco_cs_attach(void)
186 dev_list = link; 186 dev_list = link;
187 187
188 client_reg.dev_info = &dev_info; 188 client_reg.dev_info = &dev_info;
189 client_reg.EventMask =
190 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
191 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
192 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
193 client_reg.event_handler = &orinoco_cs_event;
194 client_reg.Version = 0x0210; /* FIXME: what does this mean? */ 189 client_reg.Version = 0x0210; /* FIXME: what does this mean? */
195 client_reg.event_callback_args.client_data = link; 190 client_reg.event_callback_args.client_data = link;
196 191
@@ -664,6 +659,7 @@ static struct pcmcia_driver orinoco_driver = {
664 .name = DRIVER_NAME, 659 .name = DRIVER_NAME,
665 }, 660 },
666 .attach = orinoco_cs_attach, 661 .attach = orinoco_cs_attach,
662 .event = orinoco_cs_event,
667 .detach = orinoco_cs_detach, 663 .detach = orinoco_cs_detach,
668 .id_table = orinoco_cs_ids, 664 .id_table = orinoco_cs_ids,
669}; 665};
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 31652af52eac..0643b1b94a39 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -393,11 +393,6 @@ static dev_link_t *ray_attach(void)
393 link->next = dev_list; 393 link->next = dev_list;
394 dev_list = link; 394 dev_list = link;
395 client_reg.dev_info = &dev_info; 395 client_reg.dev_info = &dev_info;
396 client_reg.EventMask =
397 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
398 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
399 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
400 client_reg.event_handler = &ray_event;
401 client_reg.Version = 0x0210; 396 client_reg.Version = 0x0210;
402 client_reg.event_callback_args.client_data = link; 397 client_reg.event_callback_args.client_data = link;
403 398
@@ -2916,6 +2911,7 @@ static struct pcmcia_driver ray_driver = {
2916 .name = "ray_cs", 2911 .name = "ray_cs",
2917 }, 2912 },
2918 .attach = ray_attach, 2913 .attach = ray_attach,
2914 .event = ray_event,
2919 .detach = ray_detach, 2915 .detach = ray_detach,
2920 .id_table = ray_ids, 2916 .id_table = ray_ids,
2921}; 2917};
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 89532fd92941..f6130a53b796 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -4684,12 +4684,6 @@ wavelan_attach(void)
4684 4684
4685 /* Register with Card Services */ 4685 /* Register with Card Services */
4686 client_reg.dev_info = &dev_info; 4686 client_reg.dev_info = &dev_info;
4687 client_reg.EventMask =
4688 CS_EVENT_REGISTRATION_COMPLETE |
4689 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
4690 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
4691 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
4692 client_reg.event_handler = &wavelan_event;
4693 client_reg.Version = 0x0210; 4687 client_reg.Version = 0x0210;
4694 client_reg.event_callback_args.client_data = link; 4688 client_reg.event_callback_args.client_data = link;
4695 4689
@@ -4904,6 +4898,7 @@ static struct pcmcia_driver wavelan_driver = {
4904 .name = "wavelan_cs", 4898 .name = "wavelan_cs",
4905 }, 4899 },
4906 .attach = wavelan_attach, 4900 .attach = wavelan_attach,
4901 .event = wavelan_event,
4907 .detach = wavelan_detach, 4902 .detach = wavelan_detach,
4908 .id_table = wavelan_ids, 4903 .id_table = wavelan_ids,
4909}; 4904};
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index e3a900482d92..e3aaaa5efccf 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -2005,13 +2005,6 @@ static dev_link_t *wl3501_attach(void)
2005 link->next = wl3501_dev_list; 2005 link->next = wl3501_dev_list;
2006 wl3501_dev_list = link; 2006 wl3501_dev_list = link;
2007 client_reg.dev_info = &wl3501_dev_info; 2007 client_reg.dev_info = &wl3501_dev_info;
2008 client_reg.EventMask = CS_EVENT_CARD_INSERTION |
2009 CS_EVENT_RESET_PHYSICAL |
2010 CS_EVENT_CARD_RESET |
2011 CS_EVENT_CARD_REMOVAL |
2012 CS_EVENT_PM_SUSPEND |
2013 CS_EVENT_PM_RESUME;
2014 client_reg.event_handler = wl3501_event;
2015 client_reg.Version = 0x0210; 2008 client_reg.Version = 0x0210;
2016 client_reg.event_callback_args.client_data = link; 2009 client_reg.event_callback_args.client_data = link;
2017 ret = pcmcia_register_client(&link->handle, &client_reg); 2010 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -2246,12 +2239,13 @@ static struct pcmcia_device_id wl3501_ids[] = {
2246MODULE_DEVICE_TABLE(pcmcia, wl3501_ids); 2239MODULE_DEVICE_TABLE(pcmcia, wl3501_ids);
2247 2240
2248static struct pcmcia_driver wl3501_driver = { 2241static struct pcmcia_driver wl3501_driver = {
2249 .owner = THIS_MODULE, 2242 .owner = THIS_MODULE,
2250 .drv = { 2243 .drv = {
2251 .name = "wl3501_cs", 2244 .name = "wl3501_cs",
2252 }, 2245 },
2253 .attach = wl3501_attach, 2246 .attach = wl3501_attach,
2254 .detach = wl3501_detach, 2247 .event = wl3501_event,
2248 .detach = wl3501_detach,
2255 .id_table = wl3501_ids, 2249 .id_table = wl3501_ids,
2256}; 2250};
2257 2251