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)
         link->next = dev_list;
         dev_list = link;
         client_reg.dev_info = &dev_info;
-        client_reg.EventMask =
-                CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-                        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-                                CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-        client_reg.event_handler = &tc574_event;
         client_reg.Version = 0x0210;
         client_reg.event_callback_args.client_data = link;
         ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1299,6 +1294,7 @@ static struct pcmcia_driver tc574_driver = {
                 .name   = "3c574_cs",
         },
         .attach         = tc574_attach,
+        .event          = tc574_event,
         .detach         = tc574_detach,
         .id_table       = tc574_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &tc589_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1074,6 +1069,7 @@ static struct pcmcia_driver tc589_driver = {
                 .name   = "3c589_cs",
         },
         .attach         = tc589_attach,
+        .event          = tc589_event,
         .detach         = tc589_detach,
         .id_table       = tc589_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &axnet_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -884,6 +879,7 @@ static struct pcmcia_driver axnet_cs_driver = {
                 .name   = "axnet_cs",
         },
         .attach         = axnet_attach,
+        .event          = axnet_event,
         .detach         = axnet_detach,
         .id_table       = axnet_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &com20020_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -495,6 +490,7 @@ static struct pcmcia_driver com20020_cs_driver = {
                 .name   = "com20020_cs",
         },
         .attach         = com20020_attach,
+        .event          = com20020_event,
         .detach         = com20020_detach,
         .id_table       = com20020_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &fmvj18x_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -797,6 +792,7 @@ static struct pcmcia_driver fmvj18x_cs_driver = {
                 .name   = "fmvj18x_cs",
         },
         .attach         = fmvj18x_attach,
+        .event          = fmvj18x_event,
         .detach         = fmvj18x_detach,
         .id_table       = fmvj18x_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &ibmtr_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -521,6 +516,7 @@ static struct pcmcia_driver ibmtr_cs_driver = {
                 .name   = "ibmtr_cs",
         },
         .attach         = ibmtr_attach,
+        .event          = ibmtr_event,
         .detach         = ibmtr_detach,
         .id_table       = ibmtr_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &nmclan_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1688,6 +1683,7 @@ static struct pcmcia_driver nmclan_cs_driver = {
                 .name   = "nmclan_cs",
         },
         .attach         = nmclan_attach,
+        .event          = nmclan_event,
         .detach         = nmclan_detach,
         .id_table       = nmclan_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &pcnet_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1844,6 +1839,7 @@ static struct pcmcia_driver pcnet_driver = {
                 .name   = "pcnet_cs",
         },
         .attach         = pcnet_attach,
+        .event          = pcnet_event,
         .detach         = pcnet_detach,
         .owner          = THIS_MODULE,
         .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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask = CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &smc91c92_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -2365,6 +2361,7 @@ static struct pcmcia_driver smc91c92_cs_driver = {
                 .name   = "smc91c92_cs",
         },
         .attach         = smc91c92_attach,
+        .event          = smc91c92_event,
         .detach         = smc91c92_detach,
         .id_table       = smc91c92_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &xirc2ps_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     if ((err = pcmcia_register_client(&link->handle, &client_reg))) {
@@ -2016,6 +2011,7 @@ static struct pcmcia_driver xirc2ps_cs_driver = {
                 .name   = "xirc2ps_cs",
         },
         .attach         = xirc2ps_attach,
+        .event          = xirc2ps_event,
         .detach         = xirc2ps_detach,
         .id_table       = xirc2ps_ids,
 };
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)
         link->next = dev_list;
         dev_list = link;
         client_reg.dev_info = &dev_info;
-        client_reg.EventMask =
-                CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-                CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-                CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-        client_reg.event_handler = &airo_event;
         client_reg.Version = 0x0210;
         client_reg.event_callback_args.client_data = link;
         ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -574,6 +569,7 @@ static struct pcmcia_driver airo_driver = {
                 .name   = "airo_cs",
         },
         .attach         = airo_attach,
+        .event          = airo_event,
         .detach         = airo_detach,
         .id_table       = airo_ids,
 };
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)
         link->next = dev_list;
         dev_list = link;
         client_reg.dev_info = &dev_info;
-        client_reg.EventMask =
-                CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-                CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-                CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-        client_reg.event_handler = &atmel_event;
         client_reg.Version = 0x0210;
         client_reg.event_callback_args.client_data = link;
         ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -668,12 +663,13 @@ static struct pcmcia_device_id atmel_ids[] = {
 MODULE_DEVICE_TABLE(pcmcia, atmel_ids);
 
 static struct pcmcia_driver atmel_driver = {
-        .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "atmel_cs",
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = "atmel_cs",
         },
-        .attach         = atmel_attach,
-        .detach         = atmel_detach,
+        .attach         = atmel_attach,
+        .event          = atmel_event,
+        .detach         = atmel_detach,
         .id_table       = atmel_ids,
 };
 
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &netwave_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
     ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -1680,6 +1675,7 @@ static struct pcmcia_driver netwave_driver = {
                 .name   = "netwave_cs",
         },
         .attach         = netwave_attach,
+        .event          = netwave_event,
         .detach         = netwave_detach,
         .id_table       = netwave_ids,
 };
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)
         dev_list = link;
 
         client_reg.dev_info = &dev_info;
-        client_reg.EventMask =
-                CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-                CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-                CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-        client_reg.event_handler = &orinoco_cs_event;
         client_reg.Version = 0x0210; /* FIXME: what does this mean? */
         client_reg.event_callback_args.client_data = link;
 
@@ -664,6 +659,7 @@ static struct pcmcia_driver orinoco_driver = {
                 .name   = DRIVER_NAME,
         },
         .attach         = orinoco_cs_attach,
+        .event          = orinoco_cs_event,
         .detach         = orinoco_cs_detach,
         .id_table       = orinoco_cs_ids,
 };
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)
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.EventMask =
-        CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-        CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-        CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-    client_reg.event_handler = &ray_event;
     client_reg.Version = 0x0210;
     client_reg.event_callback_args.client_data = link;
 
@@ -2916,6 +2911,7 @@ static struct pcmcia_driver ray_driver = {
                 .name   = "ray_cs",
         },
         .attach         = ray_attach,
+        .event          = ray_event,
         .detach         = ray_detach,
         .id_table       = ray_ids,
 };
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)
 
   /* Register with Card Services */
   client_reg.dev_info = &dev_info;
-  client_reg.EventMask = 
-    CS_EVENT_REGISTRATION_COMPLETE |
-    CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
-    CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
-    CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
-  client_reg.event_handler = &wavelan_event;
   client_reg.Version = 0x0210;
   client_reg.event_callback_args.client_data = link;
 
@@ -4904,6 +4898,7 @@ static struct pcmcia_driver wavelan_driver = {
                 .name   = "wavelan_cs",
         },
         .attach         = wavelan_attach,
+        .event          = wavelan_event,
         .detach         = wavelan_detach,
         .id_table       = wavelan_ids,
 };
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)
         link->next               = wl3501_dev_list;
         wl3501_dev_list          = link;
         client_reg.dev_info      = &wl3501_dev_info;
-        client_reg.EventMask     = CS_EVENT_CARD_INSERTION |
-                                   CS_EVENT_RESET_PHYSICAL |
-                                   CS_EVENT_CARD_RESET |
-                                   CS_EVENT_CARD_REMOVAL |
-                                   CS_EVENT_PM_SUSPEND |
-                                   CS_EVENT_PM_RESUME;
-        client_reg.event_handler = wl3501_event;
         client_reg.Version       = 0x0210;
         client_reg.event_callback_args.client_data = link;
         ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -2246,12 +2239,13 @@ static struct pcmcia_device_id wl3501_ids[] = {
 MODULE_DEVICE_TABLE(pcmcia, wl3501_ids);
 
 static struct pcmcia_driver wl3501_driver = {
-        .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "wl3501_cs",
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = "wl3501_cs",
         },
-        .attach         = wl3501_attach,
-        .detach         = wl3501_detach,
+        .attach         = wl3501_attach,
+        .event          = wl3501_event,
+        .detach         = wl3501_detach,
         .id_table       = wl3501_ids,
 };